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 --- ext/lazar/rinstall.R | 1 + lib/model.rb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ext/lazar/rinstall.R b/ext/lazar/rinstall.R index 7023f60..98e612d 100644 --- a/ext/lazar/rinstall.R +++ b/ext/lazar/rinstall.R @@ -1,6 +1,7 @@ libdir = commandArgs(trailingOnly=TRUE)[1] repo = "https://stat.ethz.ch/CRAN/" #install.packages("Rserve",lib=libdir,repos=repo,dependencies=TRUE) +install.packages("stringi",lib=libdir,repos=repo,dependencies=TRUE); install.packages("iterators",lib=libdir,repos=repo,dependencies=TRUE); install.packages("foreach",lib=libdir,repos=repo,dependencies=TRUE); install.packages("gridExtra",lib=libdir,repos=repo,dependencies=TRUE); 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