summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-04-13 15:09:02 +0200
committerAndreas Maunz <andreas@maunz.de>2012-04-13 15:09:02 +0200
commitb78bda6de028bcf93304353d1ffa06326d1ee6e6 (patch)
tree0d26319dc10f808096e0864bd1052ed74d94b2cb
parent5b903438a6a003c233b6fab475c9742019174f93 (diff)
parent261526ad45abeb2ed45470be3e5dae85befe88ec (diff)
Merge branch 'jl' into pc_unified_from_jl
Conflicts: lazar.rb
-rw-r--r--lazar.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lazar.rb b/lazar.rb
index 2ced74b..51a49aa 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -208,7 +208,6 @@ post '/lazar/?' do
# # # Activities
-
if prediction_feature.feature_type == "regression"
training_dataset.data_entries.each do |compound,entry|
lazar.activities[compound] = [] unless lazar.activities[compound]
@@ -229,7 +228,7 @@ post '/lazar/?' do
end
end
-
+ lazar.compounds=training_activities.compounds.collect
task.progress 90