summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-04-20 11:52:31 +0200
committerDavid Vorgrimmler <vorgrimmlerdavid@gmx.de>2012-04-20 11:52:31 +0200
commit8b4eecca7381c8c6fa4e941227058054e40dedf2 (patch)
tree8e738e64bc62f26bc92211d50785ffb6f0d7768c
parent1684c349afa0ed169e1def2eb5c70f0948a209f4 (diff)
Added new config file(pc) / R package (validation)
-rwxr-xr-xopentox-ruby.sh3
-rw-r--r--packs.R2
2 files changed, 2 insertions, 3 deletions
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 380dc3d..f080373 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -73,8 +73,7 @@ $GIT checkout aa-$OT_INSTALL.yaml >>$LOG 2>&1
cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,NGINX_PORT,$NGINX_PORT,;s,OHM_PORT,$OHM_PORT,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,NGINX_PORT,$NGINX_PORT,;s,OHM_PORT,$OHM_PORT,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2"
-cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit"
-cmd="cp jl_keys.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "JOELib"
+cmd="cp pc_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit"
if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then
mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
diff --git a/packs.R b/packs.R
index b6b1930..d89c94b 100644
--- a/packs.R
+++ b/packs.R
@@ -3,4 +3,4 @@
# set mirror to avoid questioning the user
options(repos="http://mirrors.softliste.de/cran")
-install.packages(c("caret", "doMC", "e1071", "foreach", "iterators", "kernlab", "multicore", "plyr", "reshape", "randomForest", "RANN"))
+install.packages(c("caret", "doMC", "e1071", "foreach", "iterators", "kernlab", "multicore", "plyr", "reshape", "randomForest", "RANN", "TunePareto"))