1 files changed, 18 insertions, 16 deletions
diff --git a/cv/scripts/CV_ds_pctype_algo_rseed_LOAEL.rb b/cv/scripts/CV_ds_pctype_algo_rseed_LOAEL.rb
index 2442b01..b35a86d 100644
--- a/cv/scripts/CV_ds_pctype_algo_rseed_LOAEL.rb
+++ b/cv/scripts/CV_ds_pctype_algo_rseed_LOAEL.rb
@@ -1,9 +1,13 @@
 # Do a 10-fold crossvalidation
 # # Author: Andreas Maunz, David Vorgrimmler
-# # @params: Dataset_name(see dataset_nestle.yaml), pc_type(electronic,cpsa or constitutional ... or nil to disable), prediction_algorithm(local_mlr_prop or local_svm_regression ...)
+# # @params: Dataset_name(see dataset.yaml), pc_type(electronic,cpsa or constitutional ... or nil to disable), prediction_algorithm(local_mlr_prop or local_svm_regression ...), algo_params (e.g. ;param_name1=param_value1;param_name2=param_value2 or nil), random_seed (1, 2, ... or 10), path (e.g. ../data/dataset.yaml)
 
-if ARGV.size != 5 
-  puts "Args: ds_name, pc_type, algo, random_seed, path/to/dataset.yaml"
+require 'rubygems'
+require 'opentox-ruby'
+require 'yaml'
+
+if ARGV.size != 6 
+  puts "Args: ds_name, pc_type, algo, algo_params, random_seed, path/to/dataset.yaml"
   puts ARGV.size
   exit
 end
@@ -11,39 +15,37 @@ end
 #ds_file = "datasets.yaml"
 #pwd=`pwd`
 #path = "#{pwd.chop}/../data/#{ds_file}"
-path = ARGV[4]
+path = ARGV[5]
 ds_file = path.split("/").last
 
 if File.exists?(path)
-  puts "#{ds_file} exists"
+  puts "[#{Time.now.utc.iso8601(4).to_s}] #{ds_file} exists."
 else
   puts "#{ds_file} does not exist."
   exit
 end
 
-require 'rubygems'
-require 'opentox-ruby'
-require 'yaml'
-
 subjectid = nil
 
 ds_name = ARGV[0] # e.g. MOU
 pc_type = ARGV[1] # e.g. electronic,cpsa or nil to disable
 algo = ARGV[2]    # e.g. local_svm_regression, local_mlr_prop
-r_seed = ARGV[3]  # 1, 2, ..., 10
+user_algo_params = ARGV[3] #e.g. ;param_name1=param_value1;param_name2=param_value2
+r_seed = ARGV[4]  # 1, 2, ..., 10
 
 ds = YAML::load_file("#{path}")
 ds_uri = ds[ds_name]["dataset"]
 pc_ds_uri = ds[ds_name][pc_type]
 
 algo_params = "prediction_algorithm=#{algo}"
-algo_params += ";pc_type=#{pc_type}" unless pc_type == "nil" 
-algo_params += ";feature_dataset_uri=#{pc_ds_uri}" unless pc_type == "nil" 
+algo_params += ";pc_type=#{pc_type}" unless (pc_type == "nil") || (pc_ds_uri.include? 'pc_type') 
+algo_params += ";feature_dataset_uri=#{pc_ds_uri}" unless (pc_type == "nil") || (pc_ds_uri.include? 'feature_dataset_uri') 
+algo_params += "#{user_algo_params}" unless user_algo_params == "nil"
 #algo_params += ";min_chisq_significance=0.9"
 #algo_params += ";min_frequency=6"
 #algo_params += ";feature_type=trees"
 
-puts algo_params.to_yaml
+puts "[#{Time.now.utc.iso8601(4).to_s}] #{algo_params.to_yaml}"
 
 prediction_feature = OpenTox::Dataset.find(ds_uri).features.keys.first
 
@@ -56,10 +58,10 @@ cv_args[:algorithm_uri] = "http://toxcreate3.in-silico.ch:8080/algorithm/lazar"
 cv_args[:algorithm_params] = algo_params
 cv_args[:stratified] = false
 cv_args[:random_seed] = r_seed
-puts cv_args.to_yaml
+puts "[#{Time.now.utc.iso8601(4).to_s}] #{cv_args.to_yaml}"
 
 cv = OpenTox::Crossvalidation.create(cv_args).uri
-puts cv
+puts "[#{Time.now.utc.iso8601(4).to_s}] #{cv}"
 
 cvr = OpenTox::CrossvalidationReport.create( cv , subjectid).uri
-puts cvr
+puts "[#{Time.now.utc.iso8601(4).to_s}] #{cvr}"