summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@ot-dev.in-silico.ch>2011-03-03 10:53:49 +0000
committerroot <root@ot-dev.in-silico.ch>2011-03-03 10:53:49 +0000
commitb8b8b91200606458bfae35e96103eedc58e40cef (patch)
tree07eba9ab9b7be23a3e0ca4f96c2d578c1d20662c
parentc0dd6b943688852a8c9485cab167e9d6ad452586 (diff)
empty activities ignored
-rw-r--r--lazar.rb26
m---------libfminer0
2 files changed, 14 insertions, 12 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
-Subproject 6e35cacd8da45f21c4039591d339a74af9a44a6
+Subproject e04a28e88d93bf2abea086924f04cbc6e97bd35