diff options
author | mr <mr@mrautenberg.de> | 2011-04-08 15:39:48 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-04-08 15:39:48 +0200 |
commit | 205d9cd79bf4090a49784307e2596e3220606702 (patch) | |
tree | 8dd24a3622db94e8a631d8a435e0766577103544 | |
parent | a68a4564c29d915cc5e97d8563372131ada882ce (diff) |
A&A fixes
-rw-r--r-- | fminer.rb | 4 | ||||
-rw-r--r-- | lazar.rb | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -70,7 +70,7 @@ post '/fminer/bbrc/?' do halt 404, "Please submit a dataset_uri." unless params[:dataset_uri] and !params[:dataset_uri].nil? halt 404, "Please submit a prediction_feature." unless params[:prediction_feature] and !params[:prediction_feature].nil? - prediction_feature = OpenTox::Feature.find params[:prediction_feature] + prediction_feature = OpenTox::Feature.find params[:prediction_feature], @subjectid training_dataset = OpenTox::Dataset.find "#{params[:dataset_uri]}", @subjectid halt 404, "No feature #{params[:prediction_feature]} in dataset #{params[:dataset_uri]}" unless training_dataset.features and training_dataset.features.include?(params[:prediction_feature]) @@ -90,7 +90,7 @@ post '/fminer/bbrc/?' do if prediction_feature.feature_type == "regression" @@bbrc.SetRegression(true) else - @training_classes = training_dataset.feature_classes(prediction_feature.uri) + @training_classes = training_dataset.feature_classes(prediction_feature.uri, @subjectid) end feature_dataset = OpenTox::Dataset.new(nil, @subjectid) @@ -115,7 +115,7 @@ post '/lazar/?' do end end - @training_classes = training_activities.feature_classes(prediction_feature.uri) if prediction_feature.feature_type == "classification" + @training_classes = training_activities.feature_classes(prediction_feature.uri, @subjectid) if prediction_feature.feature_type == "classification" lazar.prediction_algorithm = "Neighbors.local_svm_regression" if prediction_feature.feature_type == "regression" training_activities.data_entries.each do |compound,entry| |