Merge branch 'TD50' of github.com:opentox/test into TD50TD50

4 files changed, 8 insertions, 4 deletions

diff --git a/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo.rb b/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo.rb
index d969164..cb23fd1 100644
--- a/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo.rb
+++ b/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo.rb
@@ -41,6 +41,7 @@ algo_params = "prediction_algorithm=#{algo}"
 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 += ";lib=cdk"
 #algo_params += ";min_chisq_significance=0.9"
 #algo_params += ";min_frequency=6"
 #algo_params += ";feature_type=trees"
@@ -54,7 +55,7 @@ prediction_feature = OpenTox::Dataset.find(ds_uri).features.keys.first
 cv_args = {}
 cv_args[:dataset_uri] = ds_uri
 cv_args[:prediction_feature] = prediction_feature
-cv_args[:algorithm_uri] = "http://toxcreate3.in-silico.ch:8085/algorithm/lazar"
+cv_args[:algorithm_uri] = File.join(CONFIG[:services]["opentox-algorithm"],"lazar")
 cv_args[:algorithm_params] = algo_params
 cv_args[:loo] = true
 puts "[#{Time.now.utc.iso8601(4).to_s}] #{cv_args.to_yaml}"
diff --git a/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo_dv.rb b/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo_dv.rb
index d969164..24ca10c 100644
--- a/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo_dv.rb
+++ b/LOAEL/CV_ds_pctype_algo_rseed_LOAEL_loo_dv.rb
@@ -41,6 +41,7 @@ algo_params = "prediction_algorithm=#{algo}"
 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 += ";lib=cdk"
 #algo_params += ";min_chisq_significance=0.9"
 #algo_params += ";min_frequency=6"
 #algo_params += ";feature_type=trees"
@@ -54,7 +55,7 @@ prediction_feature = OpenTox::Dataset.find(ds_uri).features.keys.first
 cv_args = {}
 cv_args[:dataset_uri] = ds_uri
 cv_args[:prediction_feature] = prediction_feature
-cv_args[:algorithm_uri] = "http://toxcreate3.in-silico.ch:8085/algorithm/lazar"
+cv_args[:algorithm_uri] = File.join(CONFIG[:services]["opentox-algorithm"],"lazar") 
 cv_args[:algorithm_params] = algo_params
 cv_args[:loo] = true
 puts "[#{Time.now.utc.iso8601(4).to_s}] #{cv_args.to_yaml}"
diff --git a/TD50/CV_ds_pctype_algo_rseed_MOU_ttv.rb b/TD50/CV_ds_pctype_algo_rseed_MOU_ttv.rb
index 2c4b48d..eb4944e 100644
--- a/TD50/CV_ds_pctype_algo_rseed_MOU_ttv.rb
+++ b/TD50/CV_ds_pctype_algo_rseed_MOU_ttv.rb
@@ -39,6 +39,7 @@ 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 += ";lib=cdk"
 #algo_params += ";min_sim=0.3"
 #algo_params += ";min_chisq_significance=0.9"
 #algo_params += ";min_frequency=6"
@@ -56,7 +57,7 @@ cv_args[:test_dataset_uri] = ds_test_uri
 cv_args[:training_dataset_uri] = ds_training_uri
 #cv_args[:test_target_dataset_uri] = ds_test_target_uri
 cv_args[:prediction_feature] = prediction_feature
-cv_args[:algorithm_uri] = "http://toxcreate3.in-silico.ch:8086/algorithm/lazar"
+cv_args[:algorithm_uri] = File.join(CONFIG[:services]["opentox-algorithm"],"lazar")
 cv_args[:algorithm_params] = algo_params
 #cv_args[:stratified] = false
 #cv_args[:random_seed] = r_seed
diff --git a/TD50/CV_ds_pctype_algo_rseed_RAT_ttv.rb b/TD50/CV_ds_pctype_algo_rseed_RAT_ttv.rb
index 2c4b48d..635a036 100644
--- a/TD50/CV_ds_pctype_algo_rseed_RAT_ttv.rb
+++ b/TD50/CV_ds_pctype_algo_rseed_RAT_ttv.rb
@@ -39,6 +39,7 @@ 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 += ";lib=cdk"
 #algo_params += ";min_sim=0.3"
 #algo_params += ";min_chisq_significance=0.9"
 #algo_params += ";min_frequency=6"
@@ -56,7 +57,7 @@ cv_args[:test_dataset_uri] = ds_test_uri
 cv_args[:training_dataset_uri] = ds_training_uri
 #cv_args[:test_target_dataset_uri] = ds_test_target_uri
 cv_args[:prediction_feature] = prediction_feature
-cv_args[:algorithm_uri] = "http://toxcreate3.in-silico.ch:8086/algorithm/lazar"
+cv_args[:algorithm_uri] = File.join(CONFIG[:services]["opentox-algorithm"],"lazar") 
 cv_args[:algorithm_params] = algo_params
 #cv_args[:stratified] = false
 #cv_args[:random_seed] = r_seed