summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-07-12 13:02:29 +0200
committerAndreas Maunz <andreas@maunz.de>2011-07-12 13:02:29 +0200
commit9f9e3e699c46dc26cf0048088dcc85ccb9b68412 (patch)
tree0db5a24a64d8f78e40a76d21c7017ed7dfa0728f
parent686011c826bcef8c26b8c5fd30eafc8c8630e701 (diff)
parent309f3d5e1ce60c96128b5e13ae22656c6d6eb4be (diff)
Merge branch 'release/v2.1.0' into development
-rw-r--r--fminer.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/fminer.rb b/fminer.rb
index 45751fc..8a2c63e 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -155,8 +155,8 @@ post '/fminer/bbrc/?' do
if (!@@bbrc.GetRegression)
id_arrs = f[2..-1].flatten
- max = OpenTox::Algorithm.effect(f[2..-1].reverse, fminer.db_class_sizes)
- effect = @value_map[(f[2..-1].size-max)].to_s
+ max = OpenTox::Algorithm.effect(f[2..-1], fminer.db_class_sizes)
+ effect = f[2..-1].size-max
else #regression part
id_arrs = f[2]
# DV: effect calculation
@@ -295,7 +295,7 @@ post '/fminer/last/?' do
@value_map.each { |y,act| g[y-1]=Array.new }
feat_hash.each { |x,y| g[y-1].push(x) }
max = OpenTox::Algorithm.effect(g, fminer.db_class_sizes)
- effect = @value_map[(g.size-max)].to_s
+ effect = g.size-max
end
feature_uri = File.join feature_dataset.uri,"feature","last", features.size.to_s
unless features.include? smarts