diff options
author | mr <mr@mrautenberg.de> | 2011-04-28 11:19:27 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-04-28 11:19:27 +0200 |
commit | 902b5135a585e01516d17e0b51333769809f97db (patch) | |
tree | ad5edf11978ac2a6a44aa1fa51f326fd23387359 /fminer.rb | |
parent | 662b7bab33bdcebdddbf7579211395a22317dc9d (diff) | |
parent | b4ad8ba61cea2f7603b107bd02aaeb2d3c913557 (diff) |
Merge branch 'development' of github.com:opentox/algorithm into development
Diffstat (limited to 'fminer.rb')
-rw-r--r-- | fminer.rb | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -74,8 +74,11 @@ post '/fminer/bbrc/?' do training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}", @subjectid halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) - unless minfreq = params[:min_frequency] - minfreq = 5*training_dataset.compounds.size/1000 # 8 promille according to Andreas suggestions + unless params[:min_frequency].nil? + minfreq=params[:min_frequency].to_i + raise "Minimum frequency must be a number >0!" unless minfreq>0 + else + minfreq = 5*training_dataset.compounds.size/1000 # AM sugg. 8-10 per mil minfreq = 2 unless minfreq > 2 end @@ -247,8 +250,11 @@ post '/fminer/last/?' do training_dataset.load_all(@subjectid) halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) - unless minfreq = params[:min_frequency] - minfreq = 8*training_dataset.compounds.size/100 # 8% according to Andreas suggestions + unless params[:min_frequency].nil? + minfreq=params[:min_frequency].to_i + raise "Minimum frequency must be a number >0!" unless minfreq>0 + else + minfreq = 8*training_dataset.compounds.size/100 # AM sugg. 5-10% minfreq = 2 unless minfreq > 2 end |