summaryrefslogtreecommitdiff
path: root/lib/model.rb
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-05-25 17:10:14 +0200
committerAndreas Maunz <andreas@maunz.de>2011-05-25 17:10:14 +0200
commit2b12d07bec101df8c10b7ab5aff1491b0997a6c7 (patch)
treea97cb652f44ebc32796bced3858987e158c16768 /lib/model.rb
parentca6dd87b7c80611c4f4e4716f68fe6633ce1066b (diff)
6th v
Diffstat (limited to 'lib/model.rb')
-rw-r--r--lib/model.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/model.rb b/lib/model.rb
index 6a4602f..1a5aa37 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -215,7 +215,7 @@ module OpenTox
LOGGER.info "BLAZAR: Neighbors round #{i}: #{position} + #{lr_size}."
neighbors_balanced(s, l, position, lr_size) # get ratio fraction of larger part
props = get_props
- prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values})")
+ prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values}, props)")
if prediction_best.nil? || prediction[:confidence].abs > prediction_best[:confidence].abs
prediction_best=prediction
neighbors_best=@neighbors
@@ -233,7 +233,7 @@ module OpenTox
else # no balancing as before
neighbors
props = get_props
- prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values})")
+ prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values}, props)")
end
# TODO: reasonable feature name