summaryrefslogtreecommitdiff
path: root/lib/model.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/model.rb')
-rw-r--r--lib/model.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/model.rb b/lib/model.rb
index 38c1915..9c4a93f 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -364,8 +364,7 @@ module OpenTox
end
def repeated_crossvalidation
- # full class name required
- OpenTox::Validation::RepeatedCrossValidation.find repeated_crossvalidation_id
+ OpenTox::Validation::RepeatedCrossValidation.find repeated_crossvalidation_id # full class name required
end
def crossvalidations
@@ -387,8 +386,7 @@ module OpenTox
training_dataset = Dataset.from_csv_file file
model = Lazar.create training_dataset: training_dataset
model_validation[:model_id] = model.id
- # full class name required
- model_validation[:repeated_crossvalidation_id] = OpenTox::Validation::RepeatedCrossValidation.create(model).id
+ model_validation[:repeated_crossvalidation_id] = OpenTox::Validation::RepeatedCrossValidation.create(model).id # full class name required
model_validation.save
model_validation
end
@@ -397,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
@@ -412,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, 10, 5
model_validation[:repeated_crossvalidation_id] = repeated_cv.id
model_validation.save
model_validation