summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-05-31 08:59:18 +0000
committerChristoph Helma <helma@in-silico.ch>2011-05-31 08:59:18 +0000
commita5945d10144e49ff983dd02b0860aeb4e4e8ab1c (patch)
tree4a94d76e96f79031ede856b3c8da00d715f04d7a
parent1dbf257583fb68658f4ba4ecde3602ebef07e540 (diff)
keep classes from external datasets
-rw-r--r--lib/model.rb17
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/model.rb b/lib/model.rb
index 4321646..02fabfa 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -91,7 +91,7 @@ module OpenTox
include Model
include Algorithm
- attr_accessor :compound, :prediction_dataset, :features, :effects, :activities, :p_values, :fingerprints, :feature_calculation_algorithm, :similarity_algorithm, :prediction_algorithm, :min_sim, :subjectid, :prop_kernel
+ attr_accessor :compound, :prediction_dataset, :features, :effects, :activities, :p_values, :fingerprints, :feature_calculation_algorithm, :similarity_algorithm, :prediction_algorithm, :min_sim, :subjectid, :prop_kernel, :value_map
def initialize(uri=nil)
@@ -108,6 +108,7 @@ module OpenTox
@activities = {}
@p_values = {}
@fingerprints = {}
+ @value_map = {}
@feature_calculation_algorithm = "Substructure.match"
@similarity_algorithm = "Similarity.tanimoto"
@@ -275,15 +276,21 @@ module OpenTox
value_feature_uri = File.join( @uri, "predicted", "value")
confidence_feature_uri = File.join( @uri, "predicted", "confidence")
- prediction_feature_uris = {value_feature_uri => prediction[:prediction], confidence_feature_uri => prediction[:confidence]}
- prediction_feature_uris[value_feature_uri] = nil if @neighbors.size == 0 or prediction[:prediction].nil?
+ #prediction_feature_uris = {value_feature_uri => prediction[:prediction], confidence_feature_uri => prediction[:confidence]}
+ #prediction_feature_uris[value_feature_uri] = nil if @neighbors.size == 0 or prediction[:prediction].nil?
@prediction_dataset.metadata[OT.dependentVariables] = @metadata[OT.dependentVariables]
@prediction_dataset.metadata[OT.predictedVariables] = [value_feature_uri, confidence_feature_uri]
- prediction_feature_uris.each do |prediction_feature_uri,value|
- @prediction_dataset.add @compound.uri, prediction_feature_uri, value
+ if OpenTox::Feature.find(metadata[OT.dependentVariables]).feature_type == "classification"
+ @prediction_dataset.add @compound.uri, value_feature_uri, @value_map[prediction[:prediction]]
+ else
+ @prediction_dataset.add @compound.uri, value_feature_uri, prediction[:prediction]
end
+ @prediction_dataset.add @compound.uri, confidence_feature_uri, prediction[:confidence]
+ #prediction_feature_uris.each do |prediction_feature_uri,value|
+ #@prediction_dataset.add @compound.uri, prediction_feature_uri, @value_map[value]
+ #end
if verbose
if @feature_calculation_algorithm == "Substructure.match"