From 2baffb4a3ebfa2b4a32c0c148bf61a5da89ec210 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Fri, 25 Nov 2016 10:36:02 +0100
Subject: algorithms accessor for Model::Validation

---
 lib/model.rb                    | 6 +++++-
 test/validation-nanoparticle.rb | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/model.rb b/lib/model.rb
index 9ed3210..e8b30ca 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -355,6 +355,10 @@ module OpenTox
         Lazar.find model_id
       end
 
+      def algorithms
+        model.algorithms
+      end
+
       def prediction_feature
         model.prediction_feature
       end
@@ -404,7 +408,7 @@ module OpenTox
           :species => "A549 human lung epithelial carcinoma cells",
           :unit => prediction_feature.unit
         )
-        model = Model::LazarRegression.create(prediction_feature: prediction_feature, training_dataset: training_dataset, algorithms: algorithms)
+        model = LazarRegression.create prediction_feature: prediction_feature, training_dataset: training_dataset, algorithms: algorithms
         model_validation[:model_id] = model.id
         repeated_cv = Validation::RepeatedCrossValidation.create model
         model_validation[:repeated_crossvalidation_id] = repeated_cv.id
diff --git a/test/validation-nanoparticle.rb b/test/validation-nanoparticle.rb
index 85392a1..0c7d355 100644
--- a/test/validation-nanoparticle.rb
+++ b/test/validation-nanoparticle.rb
@@ -12,7 +12,7 @@ class NanoparticleValidationTest  < MiniTest::Test
     model = Model::Lazar.create training_dataset: @training_dataset, prediction_feature: @prediction_feature
     cv = CrossValidation.create model
     p cv.id
-    File.open("tmp.pdf","w+"){|f| f.puts cv.correlation_plot format:"pdf"}
+    #File.open("tmp.pdf","w+"){|f| f.puts cv.correlation_plot format:"pdf"}
     refute_nil cv.r_squared
     refute_nil cv.rmse
   end
@@ -32,7 +32,7 @@ class NanoparticleValidationTest  < MiniTest::Test
     assert_equal "Algorithm::Caret.pls", model.algorithms[:prediction][:method]
     cv = CrossValidation.create model
     p cv.id
-    File.open("tmp2.pdf","w+"){|f| f.puts cv.correlation_plot format:"pdf"}
+    #File.open("tmp2.pdf","w+"){|f| f.puts cv.correlation_plot format:"pdf"}
     refute_nil cv.r_squared
     refute_nil cv.rmse
   end
-- 
cgit v1.2.3