Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MGRAST/lib/Analysis.pm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sub new {
eval {
require Cache::Memcached;
Cache::Memcached->import();
$memd = new Cache::Memcached {'servers' => [$Conf::web_memcache || ''], 'debug' => 0, 'compress_threshold' => 10_000};
$memd = new Cache::Memcached {'servers' => $Conf::web_memcache, 'debug' => 0, 'compress_threshold' => 10_000};
};

# connect to database
Expand Down
2 changes: 1 addition & 1 deletion src/MGRAST/lib/WebPage/Analysis.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6513,7 +6513,7 @@ sub group_select {
my ($self) = @_;

my $user = $self->application->session->user;
my $memd = new Cache::Memcached {'servers' => [ $Conf::web_memcache || "kursk-2.mcs.anl.gov:11211" ], 'debug' => 0, 'compress_threshold' => 10_000, };
my $memd = new Cache::Memcached {'servers' => $Conf::web_memcache, 'debug' => 0, 'compress_threshold' => 10_000, };
my $cache_key = "analysis_groups_".($user ? $user->_id : "anonymous");
my $cdata = $memd->get($cache_key);

Expand Down
2 changes: 1 addition & 1 deletion src/MGRAST/lib/resources/resource.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sub new {
eval {
require Cache::Memcached;
Cache::Memcached->import();
$memd = new Cache::Memcached {'servers' => [$Conf::web_memcache || ''], 'debug' => 0, 'compress_threshold' => 10_000};
$memd = new Cache::Memcached {'servers' => $Conf::web_memcache, 'debug' => 0, 'compress_threshold' => 10_000};
};
my $url_id = get_url_id($params->{cgi}, $params->{resource}, $params->{rest_parameters}, $params->{json_rpc}, $params->{user});
my $agent = LWP::UserAgent->new;
Expand Down
25 changes: 16 additions & 9 deletions src/MGRAST/r/preprocessing.r
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,22 @@ MGRAST_preprocessing <<- function(file_in, # name of the input file (tab del
###### write the log transformed and centered data to a file
write.table(log2_cent_data, file=file_out, sep="\t", col.names = NA, row.names = TRUE, quote = FALSE)

# if (produce_fig == TRUE){ # optional - produce an out put image
if (produce_fig == TRUE){ # optional - produce an out put image
# suppressPackageStartupMessages(library(Cairo))
# CairoPNG(image_out, width = figure_width, height = figure_height, pointsize = 12, res = fiure_res , units = "px")
# split.screen(c(2,1))
# screen(1)
# boxplot(input_data, main = raw_data_boxplot_title, las=2)
# screen(2)
# boxplot(log2_cent_data, main = centered_data_boxplot_title, las=2)
# dev.off()
# }
# CairoPNG(image_out, width = figure_width, height = figure_height, pointsize = 12, res = fiure_res , units = "px")
png( # initialize the png
filename = image_out,
width = figure_width,
height = figure_height,
res = figure_res,
units = 'px'
)
split.screen(c(2,1))
screen(1)
boxplot(input_data, main = raw_data_boxplot_title, las=2)
screen(2)
boxplot(log2_cent_data, main = centered_data_boxplot_title, las=2)
dev.off()
}

}