From 280f81dcffb3b8b929ff9cbe92ba17403f5a9dd3 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Fri, 28 Oct 2016 12:31:53 +0200
Subject: adjusted r^2 removed (does not apply well to local models)

---
 lib/crossvalidation.rb          | 2 --
 lib/validation-statistics.rb    | 1 +
 test/validation-nanoparticle.rb | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/crossvalidation.rb b/lib/crossvalidation.rb
index 4f779a2..be680ae 100644
--- a/lib/crossvalidation.rb
+++ b/lib/crossvalidation.rb
@@ -95,7 +95,6 @@ module OpenTox
         crossvalidation_ids.collect{|id| CrossValidation.find(id)}
       end
 
-=begin
       def correlation_plot format: "png"
         #unless correlation_plot_id
           feature = Feature.find(crossvalidations.first.model.prediction_feature)
@@ -129,7 +128,6 @@ module OpenTox
         #end
       $gridfs.find_one(_id: correlation_plot_id).data
       end
-=end
     end
   end
 
diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb
index b251bdb..799bb34 100644
--- a/lib/validation-statistics.rb
+++ b/lib/validation-statistics.rb
@@ -139,6 +139,7 @@ module OpenTox
           :mae => mae,
           :rmse => rmse,
           :r_squared => r_squared,
+          :r_squared_adjusted => r_squared_adjusted,
           :within_prediction_interval => within_prediction_interval,
           :out_of_prediction_interval => out_of_prediction_interval,
         }
diff --git a/test/validation-nanoparticle.rb b/test/validation-nanoparticle.rb
index c0f2f92..1742ef2 100644
--- a/test/validation-nanoparticle.rb
+++ b/test/validation-nanoparticle.rb
@@ -15,6 +15,7 @@ class NanoparticleValidationTest  < MiniTest::Test
   def test_validate_default_nanoparticle_model
     model = Model::Lazar.create training_dataset: @training_dataset, prediction_feature: @prediction_feature
     cv = CrossValidation.create model
+    p cv
     p cv.rmse
     p cv.r_squared
     #File.open("tmp.pdf","w+"){|f| f.puts cv.correlation_plot}
-- 
cgit v1.2.3