summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-07-14 11:45:21 +0200
committerAndreas Maunz <andreas@maunz.de>2011-07-14 11:45:21 +0200
commit145a7fb2b2f22796859c10ef58992bbbf2dcc2c1 (patch)
tree214ff94167f4e644610d2d60595d57d9100605cb
parentd0e23cf7a9875588a216c35472b95158f80a5bc5 (diff)
Minor fixelog_mlr
-rw-r--r--lib/algorithm.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 74b1bdd..e9d646c 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -257,7 +257,7 @@ module OpenTox
LOGGER.debug "Creating MLR model ..."
c, cov, chisq, status = GSL::MultiFit::wlinear(data_matrix, w, y)
prediction = GSL::MultiFit::linear_est(q_prop, c, cov)[0]
- transformer = eval "#{transform[:class]}.new ([#{prediction}], #{transform[:offset]})"
+ transformer = eval "OpenTox::Algorithm::Transform::#{transform["class"]}.new ([#{prediction}], #{transform["offset"]})"
prediction = transformer.values[0]
LOGGER.debug "Prediction is: '" + prediction.to_s + "'."
@@ -325,7 +325,7 @@ module OpenTox
acts = neighbors.collect{ |n| n[:activity].to_f }
sims = neighbors.collect{ |n| Algorithm.gauss(n[:similarity]) }
prediction = (props.nil? ? local_svm(neighbors, acts, sims, "nu-svr", params) : local_svm_prop(props, acts, "nu-svr", params))
- transformer = eval "#{transform[:class]}.new ([#{prediction}], #{transform[:offset]})"
+ transformer = eval "OpenTox::Algorithm::Transform::#{transform["class"]}.new ([#{prediction}], #{transform["offset"]})"
prediction = transformer.values[0]
LOGGER.debug "Prediction is: '" + prediction.to_s + "'."
conf = sims.inject{|sum,x| sum + x }