diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-04-13 15:09:02 +0200 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-04-13 15:09:02 +0200 |
commit | b78bda6de028bcf93304353d1ffa06326d1ee6e6 (patch) | |
tree | 0d26319dc10f808096e0864bd1052ed74d94b2cb | |
parent | 5b903438a6a003c233b6fab475c9742019174f93 (diff) | |
parent | 261526ad45abeb2ed45470be3e5dae85befe88ec (diff) |
Merge branch 'jl' into pc_unified_from_jl
Conflicts:
lazar.rb
-rw-r--r-- | lazar.rb | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |