diff options
author | Christoph Helma <helma@in-silico.ch> | 2010-05-18 11:52:26 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2010-05-18 11:52:26 +0200 |
commit | 5d98a28d3f7f58f23947d5c34df0452c5d4cafe8 (patch) | |
tree | 8a3dfe78b0e4b86c0c2b7ccab2007114d02c6ff5 /fminer.rb | |
parent | 1b5499cc3a1a247d7dc282e911edf71a2de6c1fa (diff) |
api-wrapper version 1.5.1
Diffstat (limited to 'fminer.rb')
-rw-r--r-- | fminer.rb | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,6 @@ ENV['FMINER_SMARTS'] = 'true' ENV['FMINER_PVALUES'] = 'true' -@@fminer = Fminer::Fminer.new +@@fminer = Fminer::Fminer.new @@fminer.SetAromatic(true) get '/fminer/?' do @@ -28,15 +28,15 @@ post '/fminer/?' do LOGGER.debug "Dataset: " + params[:dataset_uri] LOGGER.debug "Endpoint: " + params[:feature_uri] feature_uri = params[:feature_uri] - #begin + begin LOGGER.debug "Retrieving #{params[:dataset_uri]}" training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}" LOGGER.debug training_dataset.to_yaml - #rescue + rescue LOGGER.error "Dataset #{params[:dataset_uri]} not found" halt 404, "Dataset #{params[:dataset_uri]} not found." if training_dataset.nil? - #end - halt 404, "No feature #{params[:feature_uri]} in dataset #{params[:dataset_uri]}." unless training_dataset.features and training_dataset.features.include?(params[:feature_uri]) + end + halt 404, "No feature #{params[:feature_uri]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:feature_uri]) task_uri = OpenTox::Task.as_task do @@ -88,7 +88,9 @@ post '/fminer/?' do id += 1 end end - LOGGER.debug "Fminer: initialised with #{id} compounds" + minfreq = (0.06*id).round + @@fminer.SetMinfreq(minfreq) + LOGGER.debug "Fminer: initialised with #{id} compounds, minimum frequency #{minfreq}" raise "no compounds" if compounds.size==0 |