adjust to new A&A for GET, remove old Report-Errorreporting

2 files changed, 21 insertions, 3 deletions

diff --git a/test/test_examples.rb b/test/test_examples.rb
index 45d7035..192f1a4 100755
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -355,7 +355,18 @@ module ValidationExamples
   end
   
   ########################################################################################################
-    
+ 
+  
+  class NtuaModel < ModelValidation
+    def initialize
+      @model_uri = "http://opentox.ntua.gr:4000/model/0d8a9a27-3481-4450-bca1-d420a791de9d" 
+      @test_dataset_uri = "http://apps.ideaconsult.net:8080/ambit2/dataset/54"
+      #@prediction_feature=http://apps.ideaconsult.net:8080/ambit2/feature/22200
+    end
+  end
+  
+   ########################################################################################################
+  
   @@list = {
       "1" => [ LazarHamsterSplit, MajorityHamsterSplit ],
       "1a" => [ LazarHamsterSplit ],
@@ -403,6 +414,8 @@ module ValidationExamples
       
       "14a" =>  [ LazarEPAFHMCrossvalidation ],
       "14b" =>  [ MajorityEPAFHMCrossvalidation ],
+      
+      "15a" =>  [ NtuaModel ],
     }
   
   def self.list
diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb
index 9f11fe7..02d5921 100755
--- a/test/test_examples_util.rb
+++ b/test/test_examples_util.rb
@@ -89,8 +89,9 @@ module ValidationExamples
     def self.wait(uri)
       if uri.task_uri?
         task = OpenTox::Task.find(uri.to_s.chomp)
-        task.wait_for_completion
-        raise "task failed: "+uri.to_s+", error is:\n"+task.description.to_s if task.error?
+        task.wait_for_completion nil,5
+        #raise "task failed: "+uri.to_s+", description: '"+task.description.to_s+"'" if task.error?
+        LOGGER.error "task failed:\n"+task.errorReport.to_yaml if task.error?
         uri = task.result_uri
       end
       uri
@@ -366,6 +367,10 @@ module ValidationExamples
     def opt_params
       [ :prediction_feature, :test_target_dataset_uri ]
     end
+    
+    def validation_type
+      "test_set_validation"
+    end    
   end
   
   class TrainingTestValidation < ValidationExample