From b8b8b91200606458bfae35e96103eedc58e40cef Mon Sep 17 00:00:00 2001 From: root Date: Thu, 3 Mar 2011 10:53:49 +0000 Subject: empty activities ignored --- lazar.rb | 26 ++++++++++++++------------ libfminer | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lazar.rb b/lazar.rb index b80235e..e89d692 100644 --- a/lazar.rb +++ b/lazar.rb @@ -113,18 +113,20 @@ post '/lazar/?' do end lazar.activities[compound] = [] unless lazar.activities[compound] - training_activities.data_entries[compound][params[:prediction_feature]].each do |value| - case value.to_s - when "true" - lazar.activities[compound] << true - when "false" - lazar.activities[compound] << false - else - halt 404, "0 values not allowed in training dataset. log10 is calculated internally." if value.to_f == 0 - lazar.activities[compound] << value.to_f - lazar.prediction_algorithm = "Neighbors.local_svm_regression" - end - end + unless training_activities.data_entries[compound][params[:prediction_feature]].empty? + training_activities.data_entries[compound][params[:prediction_feature]].each do |value| + case value.to_s + when "true" + lazar.activities[compound] << true + when "false" + lazar.activities[compound] << false + else + halt 404, "0 values not allowed in training dataset. log10 is calculated internally." if value.to_f == 0 + lazar.activities[compound] << value.to_f + lazar.prediction_algorithm = "Neighbors.local_svm_regression" + end + end + end end lazar.metadata[DC.title] = "lazar model for #{URI.decode(File.basename(prediction_feature))}" diff --git a/libfminer b/libfminer index 6e35cac..e04a28e 160000 --- a/libfminer +++ b/libfminer @@ -1 +1 @@ -Subproject commit 6e35cacd8da45f21c4039591d339a74af9a44a6d +Subproject commit e04a28e88d93bf2abea086924f04cbc6e97bd350 -- cgit v1.2.3