From f507227fd4efff3c8b32b2a8c8f2860af2546e3b Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 26 May 2011 13:11:32 +0200
Subject: Hotfix: Switch to balanced mode.

---
 lib/model.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/model.rb b/lib/model.rb
index 139aed8..14471cc 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -176,11 +176,15 @@ module OpenTox
 
         return @prediction_dataset if database_activity(subjectid)
 
-
-       if metadata[RDF.type] == [OTA.ClassificationLazySingleTarget]
+        load_metadata(subjectid)
+        case OpenTox::Feature.find(metadata[OT.dependentVariables]).feature_type
+        when "classification"
           # AM: Balancing, see http://www.maunz.de/wordpress/opentox/2011/balanced-lazar
           l = Array.new # larger 
           s = Array.new # smaller fraction
+
+          raise "no fingerprints in model" if @fingerprints.size==0
+
           @fingerprints.each do |training_compound,training_features|
             @activities[training_compound].each do |act|
               case act.to_s
@@ -231,6 +235,7 @@ module OpenTox
           ### END AM balanced predictions
 
         else # regression case: no balancing
+          LOGGER.info "LAZAR: Unbalanced."
           neighbors
           prediction = eval("#{@prediction_algorithm}(@neighbors,{:similarity_algorithm => @similarity_algorithm, :p_values => @p_values})")
         end
-- 
cgit v1.2.3