summaryrefslogtreecommitdiff
path: root/lib/fminer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/fminer.rb')
-rw-r--r--lib/fminer.rb13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/fminer.rb b/lib/fminer.rb
index 6b21ce8..4cb3455 100644
--- a/lib/fminer.rb
+++ b/lib/fminer.rb
@@ -9,17 +9,10 @@ module OpenTox
module Algorithm
# Fminer algorithms (https://github.com/amaunz/fminer2)
- class Fminer #< Algorithm
+ class Fminer
attr_accessor :prediction_feature, :training_dataset, :minfreq, :compounds, :db_class_sizes, :all_activities, :smi
- def initialize(uri, subjectid=nil)
- @uri = uri
- @subjectid = subjectid
- #super(uri, subjectid)
- end
-
-
# Check parameters of a fminer call
# Sets training dataset, prediction feature, and minfreq instance variables
# @param[Hash] parameters of the REST call
@@ -27,12 +20,12 @@ module OpenTox
def check_params(params,per_mil)
bad_request_error "Please submit a dataset_uri." unless params[:dataset_uri] and !params[:dataset_uri].nil?
- @training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", @subjectid
+ @training_dataset = OpenTox::Dataset.new "#{params[:dataset_uri]}", @subjectid
unless params[:prediction_feature] # try to read prediction_feature from dataset
resource_not_found_error "Please provide a prediction_feature parameter" unless @training_dataset.features.size == 1
params[:prediction_feature] = @training_dataset.features.first.uri
end
- @prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid
+ @prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid
resource_not_found_error "No feature '#{params[:prediction_feature]}' in dataset '#{params[:dataset_uri]}'" unless
@training_dataset.find_feature_uri( params[:prediction_feature] )
unless params[:min_frequency].nil?