diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-09 13:56:37 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-09 13:56:37 +0100 |
commit | fedbca4b1c76b81997b59db4368513a55f46bb8d (patch) | |
tree | e2c1e98ff23f59cfe040e97957e35570fa92d3cf | |
parent | 9d1cff98a43f0dc907cfa468eb73f68be7913108 (diff) | |
parent | b8b8b91200606458bfae35e96103eedc58e40cef (diff) |
Merge branch 'development' of github.com:opentox/opentox-algorithm into development
-rw-r--r-- | lazar.rb | 26 | ||||
m--------- | libfminer | 0 |
2 files changed, 14 insertions, 12 deletions
@@ -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 |