From 5b844250a7d3be05e3139e0ca3c819c3da8ee4f6 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 9 Sep 2015 14:49:35 +0200 Subject: fminer classification fixed --- lib/model.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'lib/model.rb') diff --git a/lib/model.rb b/lib/model.rb index aed789c..36011a0 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -192,15 +192,19 @@ module OpenTox end def self.from_csv_file file - p file metadata_file = file.sub(/csv$/,"json") - p metadata_file bad_request_error "No metadata file #{metadata_file}" unless File.exist? metadata_file prediction_model = self.new JSON.parse(File.read(metadata_file)) training_dataset = Dataset.from_csv_file file - # TODO classification - model = LazarRegression.create training_dataset - cv = RegressionCrossValidation.create model + model = nil + cv = nil + if training_dataset.features.first.nominal? + model = LazarFminerClassification.create training_dataset + cv = ClassificationCrossValidation.create model + elsif training_dataset.features.first.numeric? + model = LazarRegression.create training_dataset + cv = RegressionCrossValidation.create model + end prediction_model[:model_id] = model.id prediction_model[:crossvalidation_id] = cv.id prediction_model.save -- cgit v1.2.3