summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-01-13 12:32:39 +0100
committerdavor <vorgrimmlerdavid@gmx.de>2012-01-13 12:32:39 +0100
commiteff86c3f6c7e99a19edf1e38dee577a9e9080bf7 (patch)
tree5347c78a7974fcaed2815a55699a61bd86759a8a
parentb462f330bfacff53efe21d0d803d0102110c65df (diff)
parent33d9217423a9b724bd707ffa03edc5b1482a4bc3 (diff)
Merge branch 'pc_new_1' of github.com:opentox/algorithm into pc_new_1
Conflicts: lazar.rb
-rw-r--r--lazar.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lazar.rb b/lazar.rb
index 242c20f..145565a 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -158,7 +158,6 @@ post '/lazar/?' do
raise OpenTox::NotFoundError.new "Dataset #{feature_dataset_uri} not found." if training_features.nil?
training_features.data_entries.each do |compound,entry|
-
if training_activities.data_entries.has_key? compound
lazar.fingerprints[compound] = {} unless lazar.fingerprints[compound]