From 4f73de5ec7a567505224a195b7dc4bf9d563cbab Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 16 May 2012 16:39:00 +0200 Subject: renaming --- bbrc-sample | 2 +- fminer.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bbrc-sample b/bbrc-sample index bbcfdfc..6ddfc2d 160000 --- a/bbrc-sample +++ b/bbrc-sample @@ -1 +1 @@ -Subproject commit bbcfdfc85108774275a98b33ba133a0a9cab9c81 +Subproject commit 6ddfc2dc414f1e64ac16286c0cee5a4b0022d2e2 diff --git a/fminer.rb b/fminer.rb index 085fb04..fc27f18 100644 --- a/fminer.rb +++ b/fminer.rb @@ -377,12 +377,12 @@ post '/fminer/bbrc/sample/?' do @r.assign "min.frequency.per.sample", fminer.minfreq @r.assign "min.sampling.support", min_sampling_support @r.assign "random.seed", random_seed - @r.assign "do.backbone", backbone + @r.assign "backbone", backbone @r.assign "bbrc.service", File.join(CONFIG[:services]["opentox-algorithm"], "fminer/bbrc") @r.assign "dataset.service", CONFIG[:services]["opentox-dataset"] @r.eval "source(\"bbrc-sample/bbrc-sample.R\")" begin - @r.eval "bootBbrc(dataset.uri, prediction.feature.uri, num.boots, min.frequency.per.sample, min.sampling.support, NULL, bbrc.service, dataset.service, T, random.seed, as.logical(do.backbone))" + @r.eval "bootBbrc(dataset.uri, prediction.feature.uri, num.boots, min.frequency.per.sample, min.sampling.support, NULL, bbrc.service, dataset.service, T, random.seed, as.logical(backbone))" smarts = (@r.pull "ans.patterns").collect! { |id| id.gsub(/\'/,"") } # remove extra quotes around smarts r_p_values = @r.pull "ans.p.values" merge_time = @r.pull "merge.time" -- cgit v1.2.3