From bd0d062a05b97a6d875b6f94bdb77da4de9b512a Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Thu, 8 Dec 2016 13:04:38 +0100 Subject: OpenTox::Validation::RepeatedCrossValidation fixed, stringi R library added --- lib/model.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/model.rb') diff --git a/lib/model.rb b/lib/model.rb index e8b30ca..76ca0c9 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -364,7 +364,7 @@ module OpenTox end def repeated_crossvalidation - Validation::RepeatedCrossValidation.find repeated_crossvalidation_id + OpenTox::Validation::RepeatedCrossValidation.find repeated_crossvalidation_id end def crossvalidations @@ -386,7 +386,7 @@ module OpenTox training_dataset = Dataset.from_csv_file file model = Lazar.create training_dataset: training_dataset model_validation[:model_id] = model.id - model_validation[:repeated_crossvalidation_id] = Validation::RepeatedCrossValidation.create(model).id + model_validation[:repeated_crossvalidation_id] = OpenTox::Validation::RepeatedCrossValidation.create(model).id model_validation.save model_validation end @@ -410,7 +410,7 @@ module OpenTox ) 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 + repeated_cv = OpenTox::Validation::RepeatedCrossValidation.create model model_validation[:repeated_crossvalidation_id] = repeated_cv.id model_validation.save model_validation -- cgit v1.2.3 From 0813b486bc6b107a6970bae7cfb4ca262d7c5697 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Mon, 12 Dec 2016 13:02:29 +0100 Subject: 5 repeated cvs for enm --- lib/model.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/model.rb') diff --git a/lib/model.rb b/lib/model.rb index 5a1c191..9c4a93f 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -395,7 +395,7 @@ module OpenTox # find/import training_dataset training_dataset ||= Dataset.where(:name => "Protein Corona Fingerprinting Predicts the Cellular Interaction of Gold and Silver Nanoparticles").first - unless training_dataset # try to import from json dump + unless training_dataset # try to import Import::Enanomapper.import training_dataset = Dataset.where(name: "Protein Corona Fingerprinting Predicts the Cellular Interaction of Gold and Silver Nanoparticles").first bad_request_error "Cannot import 'Protein Corona Fingerprinting Predicts the Cellular Interaction of Gold and Silver Nanoparticles' dataset" unless training_dataset @@ -410,7 +410,7 @@ module OpenTox ) model = LazarRegression.create prediction_feature: prediction_feature, training_dataset: training_dataset, algorithms: algorithms model_validation[:model_id] = model.id - repeated_cv = OpenTox::Validation::RepeatedCrossValidation.create model + repeated_cv = OpenTox::Validation::RepeatedCrossValidation.create model, 10, 5 model_validation[:repeated_crossvalidation_id] = repeated_cv.id model_validation.save model_validation -- cgit v1.2.3