diff options
Diffstat (limited to 'lib/fminer.rb')
| -rw-r--r-- | lib/fminer.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/fminer.rb b/lib/fminer.rb index 59ee224..c26fe2f 100644 --- a/lib/fminer.rb +++ b/lib/fminer.rb @@ -33,8 +33,12 @@ module OpenTox resource_not_found_error "No feature '#{params[:prediction_feature]}' in dataset '#{params[:dataset]}'" unless @training_dataset.features.include?( params[:prediction_feature] ) unless params[:min_frequency].nil? + # set minfreq directly + if params[:min_frequency].numeric? + @minfreq=params[:min_frequency].to_i + $logger.debug "min_frequency #{@minfreq}" # check for percentage - if params[:min_frequency].include? "pc" + elsif params[:min_frequency].include? "pc" per_mil=params[:min_frequency].gsub(/pc/,"") if per_mil.numeric? per_mil = per_mil.to_i * 10 @@ -49,14 +53,8 @@ module OpenTox else bad_request=true end - # set minfreq directly else - if params[:min_frequency].numeric? - @minfreq=params[:min_frequency].to_i - $logger.debug "min_frequency #{@minfreq}" - else bad_request=true - end end bad_request_error "Minimum frequency must be integer [n], or a percentage [n]pc, or a per-mil [n]pm , with n greater 0" if bad_request end |