Algorithm::Generic and Model::Generic classes.

3 files changed, 9 insertions, 9 deletions

diff --git a/report/validation_access.rb b/report/validation_access.rb
index c6f6d2f..a47dede 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -218,7 +218,7 @@ class Reports::ValidationDB
   end
   
   def feature_type( validation, subjectid=nil )
-    m = OpenTox::Model.new(validation.model_uri,subjectid)
+    m = OpenTox::Model::Generic.new(validation.model_uri,subjectid)
     #m.get
     m.feature_type
     #get_model(validation).classification?
@@ -226,7 +226,7 @@ class Reports::ValidationDB
   
   def predicted_variable(validation, subjectid=nil)
     internal_server_error "cannot derive model depended props for merged validations" if Lib::MergeObjects.merged?(validation)
-    model = OpenTox::Model.new(validation.model_uri,subjectid)
+    model = OpenTox::Model::Generic.new(validation.model_uri,subjectid)
     model.get
     resource_not_found_error "model not found '"+validation.model_uri+"'" unless model
     model.predicted_variable
@@ -234,7 +234,7 @@ class Reports::ValidationDB
   
   def predicted_confidence(validation, subjectid=nil)
     internal_server_error "cannot derive model depended props for merged validations" if Lib::MergeObjects.merged?(validation)
-    model = OpenTox::Model.new(validation.model_uri,subjectid)
+    model = OpenTox::Model::Generic.new(validation.model_uri,subjectid)
     model.get
     resource_not_found_error "model not found '"+validation.model_uri+"'" unless model
     model.predicted_confidence
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index c48d1db..f044b1e 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -135,7 +135,7 @@ module Validation
       #$logger.warn "running alg"
       #$logger.warn algorithm_uri
       #$logger.warn params.inspect
-      self.model_uri = OpenTox::Algorithm.new(algorithm_uri).run(params)
+      self.model_uri = OpenTox::Algorithm::Generic.new(algorithm_uri).run(params)
       #$logger.warn "algorithm run finished"
       #$logger.warn "#{result}"
       
@@ -168,7 +168,7 @@ module Validation
       
       #model = OpenTox::Model::PredictionModel.find(self.model_uri)
       #resource_not_found_error "model not found: "+self.model_uri.to_s unless model
-      model = OpenTox::Model.new(self.model_uri, self.subjectid)
+      model = OpenTox::Model::Generic.new(self.model_uri, self.subjectid)
       #model.get
       
       unless self.algorithm_uri
@@ -200,7 +200,7 @@ module Validation
     end
     
     def compute_prediction_data_with_cv(cv_vals, waiting_task=nil)
-      models = cv_vals.collect{|v| m = OpenTox::Model.new(v.model_uri, subjectid); m.get; m}
+      models = cv_vals.collect{|v| m = OpenTox::Model::Generic.new(v.model_uri, subjectid); m.get; m}
       feature_type = models.first.feature_type # CH: subjectid is a object variable, no need to pass it as a parameter
       test_dataset_uris = cv_vals.collect{|v| v.test_dataset_uri}
       prediction_feature = cv_vals.first.prediction_feature
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index e51a4df..6616575 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -132,12 +132,12 @@ class ValidationTest < Test::Unit::TestCase
          params = {:dataset_uri=>train, 
            :prediction_feature=>prediction_feature}
          alg_params.each{ |k,v| params[k] = v }
-         model = OpenTox::Algorithm.new(alg).run(params)
+         model = OpenTox::Algorithm::Generic.new(alg).run(params)
        else
          model = "http://localhost:8085/model/ffb80776-2b11-468a-ace9-753b2ce3ec5b"
        end 
        puts "model #{model}"
-       m = OpenTox::Model.new(model)
+       m = OpenTox::Model::Generic.new(model)
        m.get
        predicted_feature = m.predicted_variable
        puts "predicted: #{predicted_feature}"
@@ -148,7 +148,7 @@ class ValidationTest < Test::Unit::TestCase
        if (apply_model)          
          params = {:dataset_uri=>test, 
                  :prediction_feature=>prediction_feature}
-         pred = OpenTox::Model.new(model).run(params)
+         pred = OpenTox::Model::Generic.new(model).run(params)
        else
          pred = "http://localhost:8083/dataset/354ccada-3b0c-4ceb-9acf-a0f7dc9c5e09"
        end