Merge branch 'development' of ssh://git.in-silico.ch:2222/home/ist/public/lazar into developmentdevelopment

2 files changed, 45 insertions, 0 deletions

diff --git a/test/classification-validation.rb b/test/classification-validation.rb
index 33f0353..b913e1e 100644
--- a/test/classification-validation.rb
+++ b/test/classification-validation.rb
@@ -36,6 +36,34 @@ class ClassificationValidationTest < MiniTest::Test
       refute_nil validation.model.training_dataset_id
       refute_equal model.training_dataset_id, validation.model.training_dataset_id
       assert_equal params, validation_params
+      keys = cv.accuracy.keys
+      av = cv.accept_values
+      types = ["nr_predictions", \
+               "predictivity", \
+               "true_rate", \
+               "confusion_matrix"
+      ]
+      types.each do |type|
+        keys.each do |key|
+          case type
+          when "confusion_matrix"
+            cv[type][key].each do |arr|
+              arr.each do |a|
+                refute_nil a
+                assert a > 0, "#{cv[type][key]} values should be greater than 0."
+              end
+            end
+          when "predictivity", "true_rate"
+            av.each do |v|
+              refute_nil cv[type][key][v]
+              assert cv[type][key][v] > 0, "#{cv[type][key]} values should be greater than 0."
+            end
+          else
+            refute_nil cv[type][key]
+            assert cv[type][key] > 0, "#{cv[type][key]} value should be greater than 0."
+          end
+        end
+      end
     end
   end
   
diff --git a/test/regression-validation.rb b/test/regression-validation.rb
index 65bec63..9a2da8f 100644
--- a/test/regression-validation.rb
+++ b/test/regression-validation.rb
@@ -86,6 +86,23 @@ class RegressionValidationTest < MiniTest::Test
     repeated_cv.crossvalidations.each do |cv|
       assert cv.r_squared[:all] > 0.34, "R^2 (#{cv.r_squared[:all]}) should be larger than 0.34"
       assert cv.rmse[:all] < 1.5, "RMSE (#{cv.rmse[:all]}) should be smaller than 0.5"
+=begin
+      #actually some values can be 0 or nil depending on the random folds in this small dataset
+      keys = cv.rmse.keys
+      types = ["rmse", \
+               "r_squared", \
+               "mae", \
+               "nr_predictions", \
+               "within_prediction_interval", \
+               "out_of_prediction_interval"
+      ]
+      types.each do |type| 
+        keys.each do |key|
+          refute_nil cv[type][key]
+          assert cv[type][key] > 0
+        end
+      end
+=end
     end
   end