api-wrapper version 1.5.1

1 files changed, 8 insertions, 6 deletions

diff --git a/fminer.rb b/fminer.rb
index 04572cb..7178dcd 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -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