From 455da06aa6459da0d25b286ca6cb866ff64c4c34 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Thu, 20 Jun 2019 22:01:50 +0200 Subject: separate csv serialisations for batch predictions and training data, repeated measurements in mutagenicity dataset fixed, daphnia import fixed, CENTRAL_MONGO_IP removed --- ext/lazar/extconf.rb | 2 +- ext/lazar/rinstall.R | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'ext/lazar') diff --git a/ext/lazar/extconf.rb b/ext/lazar/extconf.rb index 7cd85e0..aa031e5 100644 --- a/ext/lazar/extconf.rb +++ b/ext/lazar/extconf.rb @@ -10,7 +10,7 @@ programs.each do |program| abort "Please install #{program} on your system." unless find_executable program end -abort "Please install Rserve on your system. Execute 'install.packages('Rserve')' in a R console running as root ('sudo R')." unless `R CMD Rserve --version`.match(/^Rserve/) +abort "Please install the latest Rserve version on your system (the CRAN version is outdated). Execute 'install.packages('Rserve',,'http://www.rforge.net/')' in a R console running as root ('sudo R')." unless `R CMD Rserve --version`.match(/^Rserve v1.8/) # install R packages r_dir = File.join main_dir, "R" diff --git a/ext/lazar/rinstall.R b/ext/lazar/rinstall.R index 98e612d..17c2e61 100644 --- a/ext/lazar/rinstall.R +++ b/ext/lazar/rinstall.R @@ -1,12 +1,14 @@ 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); -install.packages("ggplot2",lib=libdir,repos=repo,dependencies=TRUE); -install.packages("pls",lib=libdir,repos=repo,dependencies=TRUE); -install.packages("randomForest",lib=libdir,repos=repo,dependencies=TRUE); -install.packages("caret",lib=libdir,repos=repo,dependencies=TRUE); -install.packages("doMC",lib=libdir,repos=repo,dependencies=TRUE); +#install.packages("Rserve",lib=libdir,repos=) +# dependencies=TRUE installs unnecessary Suggests packages. The default, NA, means c("Depends", "Imports", "LinkingTo"). +install.packages("caret",lib=libdir,repos=repo); +install.packages("stringi",lib=libdir,repos=repo); +install.packages("iterators",lib=libdir,repos=repo); +install.packages("labeling",lib=libdir,repos=repo); +install.packages("foreach",lib=libdir,repos=repo); +install.packages("gridExtra",lib=libdir,repos=repo); +install.packages("ggplot2",lib=libdir,repos=repo); +install.packages("pls",lib=libdir,repos=repo); +install.packages("randomForest",lib=libdir,repos=repo); +install.packages("doMC",lib=libdir,repos=repo); -- cgit v1.2.3