summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-05-25 15:04:50 +0200
committerAndreas Maunz <andreas@maunz.de>2011-05-25 15:04:50 +0200
commitca6dd87b7c80611c4f4e4716f68fe6633ce1066b (patch)
treefb180e450603c048d2a2ed3549e247bf95c12ede /lib
parent3f209f75a2abe2b8a89df3afcb3f54ec8329a5e1 (diff)
4th v
Diffstat (limited to 'lib')
-rw-r--r--lib/algorithm.rb4
-rw-r--r--lib/model.rb5
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 280ed82..2f722c1 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -178,7 +178,7 @@ module OpenTox
sims = neighbors.collect{ |n| Algorithm.gauss(n[:similarity]) } # similarity values btwn q and nbors
begin
- prediction = (props.nil? ? local_svm(neighbors, acts, sims, "nu-svr", params) : local_svm_prop(neighbors, acts, sims, "nu-svr", params, props))
+ prediction = (props.nil? ? local_svm(neighbors, acts, sims, "nu-svr", params) : local_svm_prop(props, acts, sims, "nu-svr", params))
prediction = (take_logs ? 10**(prediction.to_f) : prediction.to_f)
LOGGER.debug "Prediction is: '" + prediction.to_s + "'."
rescue Exception => e
@@ -203,7 +203,7 @@ module OpenTox
acts_f = acts.collect {|v| v == true ? 1.0 : 0.0}
sims = neighbors.collect{ |n| Algorithm.gauss(n[:similarity]) } # similarity values btwn q and nbors
begin
- prediction = (props.nil? ? local_svm(neighbors, acts_f, sims, "C-bsvc", params) : local_svm_prop(neighbors, acts_f, sims, "C-bsvc", params, props))
+ prediction = (props.nil? ? local_svm(neighbors, acts_f, sims, "C-bsvc", params) : local_svm_prop(props, acts_f, sims, "C-bsvc", params))
LOGGER.debug "Prediction is: '" + prediction.to_s + "'."
rescue Exception => e
LOGGER.debug "#{e.class}: #{e.message} #{e.backtrace}"
diff --git a/lib/model.rb b/lib/model.rb
index f4df8ea..6a4602f 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -176,8 +176,7 @@ module OpenTox
return @prediction_dataset if database_activity(subjectid)
-
- if metadata[RDF.type] == [OTA.ClassificationLazySingleTarget]
+ if metadata[RDF.type].include?([OTA.ClassificationLazySingleTarget][0]) # AM: searching in metadata for classification
# AM: Balancing, see http://www.maunz.de/wordpress/opentox/2011/balanced-lazar
l = Array.new # larger
s = Array.new # smaller fraction
@@ -231,7 +230,7 @@ module OpenTox
@neighbors=neighbors_best
### END AM balanced predictions
- else # regression case: no balancing
+ else # no balancing as before
neighbors
props = get_props
prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values})")