Merge commit 'mguetlein/test'

Conflicts:

	application.rb

1 files changed, 93 insertions, 4 deletions

diff --git a/test/test_examples.rb b/test/test_examples.rb
index beeaa30..bbe6ddd 100644
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -9,6 +9,53 @@ end
 
 module ValidationExamples
   
+  class IrisCrossvalidation < CrossValidation
+    def initialize
+      @dataset_file = File.new("data/IRIS_unitrisk.yaml","r")
+      @prediction_feature = "http://ot-dev.in-silico.ch/toxcreate/feature#IRIS%20unit%20risk"
+      @num_folds = 10
+    end
+  end
+  
+  class MajorityIrisCrossvalidation < IrisCrossvalidation
+    def initialize
+      @algorithm_uri = File.join(@@config[:services]["opentox-majority"],"/regr/algorithm")
+      super
+    end
+  end
+
+  class LazarIrisCrossvalidation < IrisCrossvalidation
+    def initialize
+      @algorithm_uri = File.join(@@config[:services]["opentox-algorithm"],"lazar")
+      @algorithm_params = "feature_generation_uri="+File.join(@@config[:services]["opentox-algorithm"],"fminer")
+      super
+    end
+  end
+  
+  ########################################################################################################  
+  
+  class IrisSplit < SplitTestValidation
+    def initialize
+      @dataset_file = File.new("data/IRIS_unitrisk.yaml","r")
+      @prediction_feature = "http://ot-dev.in-silico.ch/toxcreate/feature#IRIS%20unit%20risk"
+    end
+  end
+  
+  class LazarIrisSplit < IrisSplit
+    def initialize
+      @algorithm_uri = File.join(@@config[:services]["opentox-algorithm"],"lazar")
+      @algorithm_params = "feature_generation_uri="+File.join(@@config[:services]["opentox-algorithm"],"fminer")
+      super
+    end
+  end
+  
+  class MajorityIrisSplit < IrisSplit
+    def initialize
+      @algorithm_uri = File.join(@@config[:services]["opentox-majority"],"/regr/algorithm")
+      super
+    end
+  end
+  
   ########################################################################################################
   
   class HamsterSplit < SplitTestValidation
@@ -86,21 +133,21 @@ module ValidationExamples
   
   ########################################################################################################  
 
-  class ISTHamsterCrossvalidationInsilico < CrossValidation
+  class ISTHamsterCrossvalidation < CrossValidation
     def initialize
       @dataset_uri = "http://webservices.in-silico.ch/dataset/108"
       @prediction_feature = "http://toxcreate.org/feature#Hamster%20Carcinogenicity%20(DSSTOX/CPDB)"
     end
   end
   
-  class MajorityISTHamsterCrossvalidation < ISTHamsterCrossvalidationInsilico
+  class MajorityISTHamsterCrossvalidation < ISTHamsterCrossvalidation
     def initialize
       @algorithm_uri = File.join(@@config[:services]["opentox-majority"],"/class/algorithm")
       super
     end
   end
   
-  class LazarISTHamsterCrossvalidation < ISTHamsterCrossvalidationInsilico
+  class LazarISTHamsterCrossvalidation < ISTHamsterCrossvalidation
     def initialize
       @algorithm_uri = File.join(@@config[:services]["opentox-algorithm"],"lazar")
       @algorithm_params = "feature_generation_uri="+File.join(@@config[:services]["opentox-algorithm"],"fminer")
@@ -108,14 +155,47 @@ module ValidationExamples
     end
   end
   
-  class ISTLazarISTHamsterCrossvalidation < ISTHamsterCrossvalidationInsilico
+  class ISTLazarISTHamsterCrossvalidation < ISTHamsterCrossvalidation
     def initialize
       @algorithm_uri = "http://webservices.in-silico.ch/algorithm/lazar"
       @algorithm_params = "feature_generation_uri=http://webservices.in-silico.ch/algorithm/fminer"
       super
     end
   end
+  
+  ########################################################################################################  
+
+  class ISTIrisCrossvalidation < CrossValidation
+    def initialize
+      @dataset_uri = "http://ot-dev.in-silico.ch/dataset/39"
+      @prediction_feature = "http://ot-dev.in-silico.ch/toxcreate/feature#IRIS%20unit%20risk"
+    end
+  end
+  
+  class ISTLazarISTIrisCrossvalidation < ISTIrisCrossvalidation
+    def initialize
+      @algorithm_uri = "http://ot-dev.in-silico.ch/algorithm/lazar"
+      @algorithm_params = "feature_generation_uri=http://ot-dev.in-silico.ch/algorithm/fminer"
+      super
+    end
+  end
+  
+    ########################################################################################################  
 
+  class ISTEpaCrossvalidation < CrossValidation
+    def initialize
+      @dataset_uri = "http://ot-dev.in-silico.ch/dataset/69"
+      @prediction_feature = "http://ot-dev.in-silico.ch/toxcreate/feature#EPA%20FHM"
+    end
+  end
+  
+  class ISTLazarISTEpaCrossvalidation < ISTEpaCrossvalidation
+    def initialize
+      @algorithm_uri = "http://ot-dev.in-silico.ch/algorithm/lazar"
+      @algorithm_params = "feature_generation_uri=http://ot-dev.in-silico.ch/algorithm/fminer"
+      super
+    end
+  end
   
   ########################################################################################################
   
@@ -192,6 +272,15 @@ module ValidationExamples
       "6b" => [ MLR_NTUA_CacoTrainingTest ],
       "6c" => [ MLR_NTUA2_CacoTrainingTest ],
       "6d" => [ MajorityCacoTrainingTest ],
+      
+      "7a" =>  [ LazarIrisSplit ],
+      "7b" =>  [ MajorityIrisSplit ],
+      
+      "8b" => [ MajorityIrisCrossvalidation ],
+      
+      "9a" => [ ISTLazarISTIrisCrossvalidation ],
+      
+      "10a" => [ ISTLazarISTEpaCrossvalidation ],
     }
   
   def self.list