diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2012-12-03 12:05:14 +0100 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2012-12-03 12:05:14 +0100 |
| commit | 043335dfc8a4074f061b27fc0f4663100c599143 (patch) | |
| tree | 929f688681fbb27347f6eb66adfe6d932b84a927 | |
| parent | 83dda9ac1522ae8f1286037ccf5dcd80412d776e (diff) | |
storing database activities as predictions AND as measurements, not only as predictions
| -rw-r--r-- | lib/model.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/model.rb b/lib/model.rb index 908cf03..a3e5f5c 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -401,11 +401,18 @@ module OpenTox # @return [Boolean] true if compound has databasse activities, false if not def database_activity(subjectid) if @activities[@compound.uri] + @prediction_dataset.add_feature(metadata[OT.dependentVariables]) unless @prediction_dataset.features.include?(metadata[OT.dependentVariables]) @prediction_dataset.add_compound @compound.uri if OpenTox::Feature.find(metadata[OT.dependentVariables], subjectid).feature_type == "classification" - @activities[@compound.uri].each { |act| @prediction_dataset.add_data_entry @compound.uri, value_feature_uri, @value_map[act.to_s] } + @activities[@compound.uri].each do |act| + @prediction_dataset.add_data_entry @compound.uri, value_feature_uri, @value_map[act.to_s] + @prediction_dataset.add_data_entry @compound.uri, metadata[OT.dependentVariables], @value_map[act.to_s] + end else - @activities[@compound.uri].each { |act| @prediction_dataset.add_data_entry @compound.uri, value_feature_uri, act } + @activities[@compound.uri].each do |act| + @prediction_dataset.add_data_entry @compound.uri, value_feature_uri, act + @prediction_dataset.add_data_entry @compound.uri, metadata[OT.dependentVariables], act + end end @activities[@compound.uri].each { |act| @prediction_dataset.add_data_entry @compound.uri, confidence_feature_uri, 1 } @prediction_dataset.add_metadata(OT.hasSource => @metadata[OT.trainingDataset]) |