set cookie in reports, hack for ambit, new examples

2 files changed, 45 insertions, 9 deletions

diff --git a/test/test_examples.rb b/test/test_examples.rb
index cfedcbd..892efb9 100755
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -379,27 +379,47 @@ module ValidationExamples
   
   ########################################################################################################
   
-  class AmbitModel < ModelValidation
+  class AmbitModelValidation < ModelValidation
     def initialize
       @model_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/model/29139"
       @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560"
     end
   end    
   
-  
-    ########################################################################################################
+  class AmbitBursiModelValidation < ModelValidation
+    def initialize
+      @model_uri =  "https://ambit.uni-plovdiv.bg:8443/ambit2/model/35194"
+      @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401577"
+    end
+  end
   
   class AmbitTrainingTest < TrainingTestValidation
     def initialize
-      #@model_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/model/29139"
       @training_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560"
+      #@training_dataset_uri = "http://opentox.informatik.uni-freiburg.de/dataset/317"
       @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560"
       @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/22190"
       @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/LR"
     end
   end   
   
-      ########################################################################################################
+  class AmbitBursiTrainingTest < TrainingTestValidation
+    def initialize
+      @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401577"
+      @training_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401577"
+      @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/26221"
+      @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/J48"
+    end
+  end    
+  
+  class AmbitJ48TrainingTest < TrainingTestValidation
+    def initialize
+      @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/39914"
+      @training_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/39914"
+      @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/221726"
+      @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/J48"
+    end
+  end  
   
   class AmbitTrainingTestSplit < SplitTestValidation
     def initialize
@@ -411,6 +431,14 @@ module ValidationExamples
     end
   end  
   
+  class AmbitBursiTrainingTestSplit < SplitTestValidation
+    def initialize
+      @dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401577"
+      @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/26221"
+      @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/J48"
+    end
+  end    
+  
   
    ########################################################################################################
    
@@ -545,11 +573,14 @@ module ValidationExamples
       
       "18a" =>  [ TumModel ],
       
-      "19a" =>  [ AmbitModel ],
-      
-      "20a" =>  [ AmbitTrainingTest ],
+      "19a" =>  [ AmbitModelValidation ],
+      "19b" =>  [ AmbitTrainingTest ],
+      "19c" =>  [ AmbitTrainingTestSplit ],
+      "19d" => [ AmbitBursiTrainingTest ],
+      "19e" => [ AmbitBursiModelValidation ],
+      "19f" => [ AmbitBursiTrainingTestSplit ],
+      "19g" => [ AmbitJ48TrainingTest ],
       
-      "21a" =>  [ AmbitTrainingTestSplit ],
     }
   
   def self.list
diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb
index d596a9a..2df6e7e 100755
--- a/test/test_examples_util.rb
+++ b/test/test_examples_util.rb
@@ -24,6 +24,11 @@ module ValidationExamples
           raise "num features not 1 (="+d.features.keys.size.to_s+"), what to predict??" if d.features.keys.size != 1
           @@prediction_features[file.path.to_s] = d.features.keys[0]
           @@dataset_uris[file.path.to_s] = d.uri
+        elsif (file.path =~ /rdf$/)
+          d = OpenTox::Dataset.create(CONFIG[:services]["opentox-dataset"], subjectid)
+          d.load_rdfxml_file(file, subjectid)
+          d.save(subjectid)
+          @@dataset_uris[file.path.to_s] = d.uri
         else
           raise "unknown file type: "+file.path.to_s
         end