minor fixes + adjustments to set percentage completed

3 files changed, 12 insertions, 14 deletions

diff --git a/lib/ot_predictions.rb b/lib/ot_predictions.rb
index 52683a6..50934e5 100755
--- a/lib/ot_predictions.rb
+++ b/lib/ot_predictions.rb
@@ -79,9 +79,9 @@ module Lib
         # TODO: remove LAZAR_PREDICTION_DATASET_HACK
         no_prediction_feature = prediction_dataset.features.keys.index(predicted_variable)==nil
         if no_prediction_feature
-          one_entry_per_compound = prediction_dataset.data_entries.keys.size == @compounds.size
+          one_entry_per_compound = true
           @compounds.each do |c|
-            if prediction_dataset.data_entries[c].size != 1
+            if prediction_dataset.data_entries[c] and prediction_dataset.data_entries[c].size != 1
               one_entry_per_compound = false
               break
             end
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index 01fba7b..da5822e 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -76,8 +76,7 @@ module Validation
       LOGGER.debug "building model '"+algorithm_uri.to_s+"' "+params.inspect
       
       algorithm = OpenTox::Algorithm::Generic.new(algorithm_uri)
-      self.model_uri = algorithm.run(params)
-      task.progress(33)
+      self.model_uri = algorithm.run(params, OpenTox::SubTask.create(task, 0, 33))
       
       #model = OpenTox::Model::PredictionModel.build(algorithm_uri, params, 
       #  OpenTox::SubTask.create(task, 0, 33) )
@@ -129,8 +128,7 @@ module Validation
       prediction_dataset_uri = ""
       benchmark = Benchmark.measure do 
         #prediction_dataset_uri = model.predict_dataset(self.test_dataset_uri, OpenTox::SubTask.create(task, 0, 50))
-        prediction_dataset_uri = model.run(:dataset_uri => self.test_dataset_uri)
-        task.progress(50)
+        prediction_dataset_uri = model.run( {:dataset_uri => self.test_dataset_uri}, OpenTox::SubTask.create(task, 0, 50))
       end
 #      self.attributes = { :prediction_dataset_uri => prediction_dataset_uri,
 #             :real_runtime => benchmark.real }
@@ -223,8 +221,8 @@ module Validation
     
     def perform_cv ( prediction_feature, algorithm_params=nil, task=nil )
       
-      create_cv_datasets( prediction_feature, OpenTox::SubTask.create(task, 0, 0.33) )
-      perform_cv_validations( algorithm_params, OpenTox::SubTask.create(task, 0.33, 1) )
+      create_cv_datasets( prediction_feature, OpenTox::SubTask.create(task, 0, 33) )
+      perform_cv_validations( algorithm_params, OpenTox::SubTask.create(task, 33, 100) )
     end
     
     # deletes a crossvalidation, all validations are deleted as well
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index d9c2fbb..3139b29 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -96,15 +96,15 @@ class ValidationTest < Test::Unit::TestCase
     # puts m.to_yaml
 
 #     post "/validate_datasets",{
-#      :test_dataset_uri=>"http://localhost/dataset/150",
-#       :prediction_dataset_uri=>"http://localhost/dataset/152",
-#       :test_target_dataset_uri=>"http://localhost/dataset/148",
-#       :prediction_feature=>"http://localhost/dataset/148/feature/LC50_mmol",
-#       :model_uri=>"http://localhost/model/13"}
+#      :test_dataset_uri=>"http://localhost/dataset/506",
+#       :prediction_dataset_uri=>"http://localhost/dataset/526",
+#       :test_target_dataset_uri=>"http://localhost/dataset/504",
+#       :prediction_feature=>"http://localhost/dataset/504/feature/LC50_mmol",
+#       :model_uri=>"http://localhost/model/48"}
 #      #:regression=>"true"}
 ##       :classification=>"true"}
 #    puts last_response.body
-
+    
     #run_test("13a","http://localhost/validation/39",nil,false) #,"http://localhost/validation/28")#,"http://localhost/validation/394");
     run_test("1b",nil,nil,false)