summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-04-10 13:32:51 +0200
committerAndreas Maunz <andreas@maunz.de>2012-04-10 13:32:51 +0200
commit9654d5446cf40b4dd6deb00131c5444f44711f7b (patch)
tree86b8dbe79b1cf9b04e62ebfc7450c3dab10559ca
parent707741058c7ec5cccf6ced869f0bca25aad250c4 (diff)
Removed value_map from params
-rw-r--r--lib/algorithm.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index d38b79a..948d4b7 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -69,7 +69,7 @@ module OpenTox
end
end
- def add_fminer_data(fminer_instance, params, value_map)
+ def add_fminer_data(fminer_instance, value_map)
id = 1 # fminer start id is not 0
@training_dataset.data_entries.each do |compound,entry|
@@ -84,7 +84,6 @@ module OpenTox
next
end
- value_map=params[:value_map] unless params[:value_map].nil?
entry.each do |feature,values|
if feature == @prediction_feature.uri
values.each do |value|
@@ -92,7 +91,7 @@ module OpenTox
LOGGER.warn "No #{feature} activity for #{compound.to_s}."
else
if @prediction_feature.feature_type == "classification"
- activity= value_map.invert[value.to_s].to_i # activities are mapped to 1..n
+ activity= value_map.invert[value].to_i # activities are mapped to 1..n
@db_class_sizes[activity-1].nil? ? @db_class_sizes[activity-1]=1 : @db_class_sizes[activity-1]+=1 # AM effect
elsif @prediction_feature.feature_type == "regression"
activity= value.to_f