summaryrefslogtreecommitdiff
path: root/lazar.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lazar.rb')
-rw-r--r--lazar.rb15
1 files changed, 5 insertions, 10 deletions
diff --git a/lazar.rb b/lazar.rb
index 65752ec..81929c6 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -93,20 +93,19 @@ post '/lazar/?' do
min_sim = params[:min_sim].to_f if params[:min_sim]
min_sim = 0.3 unless params[:min_sim]
+ # Algorithm
+ lazar.prediction_algorithm = "Neighbors.#{params[:prediction_algorithm]}" if params[:prediction_algorithm]
+
# Nr Hits
nr_hits = false
- if params[:nr_hits] == "true"
+ if params[:nr_hits] == "true" || lazar.prediction_algorithm.include?("local_svm")
lazar.feature_calculation_algorithm = "Substructure.match_hits"
nr_hits = true
end
params[:nr_hits] = "true" if lazar.feature_calculation_algorithm == "Substructure.match_hits" #not sure if this line in needed
- # Algorithm
- lazar.prediction_algorithm = "Neighbors.#{params[:prediction_algorithm]}" if params[:prediction_algorithm]
-
# Propositionalization
- propositionalized = false
- propositionalized = true if ( params[:propositionalized] != "false" && ( lazar.prediction_algorithm == "local_mlr_prop" || lazar.prediction_algorithm.include?("local_svm") ) )
+ propositionalized = (lazar.prediction_algorithm=="Neighbors.weighted_majority_vote" ? false : true)
# PC type
pc_type = params[:pc_type] unless params[:pc_type].nil?
@@ -115,10 +114,6 @@ post '/lazar/?' do
min_train_performance = params[:min_train_performance].to_f if params[:min_train_performance]
min_train_performance = 0.1 unless params[:min_train_performance]
- # Conf_stdev --- To be removed??
- lazar.conf_stdev = ( (params[:conf_stdev] == "true") ? true : false )
-
-