all tests fixed

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/model.rb b/lib/model.rb
index 81f9629..3482aee 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -236,7 +236,7 @@ module OpenTox
       end
 
       def repeated_crossvalidation
-        RepeatedCrossValidation.find repeated_crossvalidation_id
+        Validation::RepeatedCrossValidation.find repeated_crossvalidation_id
       end
 
       def crossvalidations
@@ -244,7 +244,7 @@ module OpenTox
       end
 
       def leave_one_out_validation
-        LeaveOneOutValidation.find leave_one_out_validation_id
+        Validation::LeaveOneOut.find leave_one_out_validation_id
       end
 
       def regression?
@@ -269,8 +269,8 @@ module OpenTox
         end
         prediction_model[:model_id] = model.id
         prediction_model[:prediction_feature_id] = prediction_feature.id
-        prediction_model[:repeated_crossvalidation_id] = RepeatedCrossValidation.create(model).id
-        prediction_model[:leave_one_out_validation_id] = LeaveOneOutValidation.create(model).id
+        prediction_model[:repeated_crossvalidation_id] = Validation::RepeatedCrossValidation.create(model).id
+        prediction_model[:leave_one_out_validation_id] = Validation::LeaveOneOut.create(model).id
         prediction_model.save
         prediction_model
       end
diff --git a/lib/nanoparticle.rb b/lib/nanoparticle.rb
index d0f8f51..ca79a3d 100644
--- a/lib/nanoparticle.rb
+++ b/lib/nanoparticle.rb
@@ -100,6 +100,8 @@ module OpenTox
     end
 
     def parse_ambit_value feature, v, dataset
+      #p dataset
+      #p feature
       v.delete "unit"
       # TODO: ppm instead of weights
       if v.keys == ["textValue"]