diff options
| author | micha <micha@lappi.(none)> | 2011-08-08 14:09:24 +0200 |
|---|---|---|
| committer | micha <micha@lappi.(none)> | 2011-08-08 14:09:24 +0200 |
| commit | e1b67ddbefe6e4f456346943ffb604d2b5ad44e3 (patch) | |
| tree | cde18ff142f6fde72bb7a9ec1c90342066d14ab8 | |
| parent | 6f26ea70b05b69fb69a102fb4cec688338c1f7ff (diff) | |
| parent | 97a72e902833316e2e0014229bbfeeba3ef3a438 (diff) | |
Merge remote branch 'origin/development'v2.1.0
| -rw-r--r-- | lib/model.rb | 6 | ||||
| -rw-r--r-- | lib/task.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/model.rb b/lib/model.rb index ff0ce0e..8a07858 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -364,7 +364,11 @@ module OpenTox # @return [Boolean] true if compound has databasse activities, false if not def database_activity(subjectid) if @activities[@compound.uri] - @activities[@compound.uri].each { |act| @prediction_dataset.add @compound.uri, @metadata[OT.dependentVariables], @value_map[act] } + if OpenTox::Feature.find(metadata[OT.dependentVariables], subjectid).feature_type == "classification" + @activities[@compound.uri].each { |act| @prediction_dataset.add @compound.uri, @metadata[OT.dependentVariables], @value_map[act] } + else + @activities[@compound.uri].each { |act| @prediction_dataset.add @compound.uri, @metadata[OT.dependentVariables], act } + end @prediction_dataset.add_metadata(OT.hasSource => @metadata[OT.trainingDataset]) @prediction_dataset.save(subjectid) true diff --git a/lib/task.rb b/lib/task.rb index 00499fa..dbcbe59 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -250,7 +250,7 @@ module OpenTox load_metadata # for extremely fast tasks check_state - while self.running? + while self.running? or self.queued? sleep dur load_metadata # if another (sub)task is waiting for self, set progress accordingly |