diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-08-04 13:56:04 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-08-04 13:56:04 +0000 |
| commit | 69cb4d3672c50f009b9edc154fe69f15bcafc0da (patch) | |
| tree | a29c01a61102b6632e10306be043edf67a299ad5 | |
| parent | 6b382e3925b85d0efe2fcc75b1651c611e2c3e09 (diff) | |
feature highlighting and significant features fixed for generic classes and regression
| -rw-r--r-- | lib/environment.rb | 4 | ||||
| -rw-r--r-- | lib/serializer.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/environment.rb b/lib/environment.rb index 28a9a66..6d1bb85 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -40,8 +40,8 @@ else end # Regular expressions for parsing classification data -TRUE_REGEXP = /^(true|active|1|1.0|tox)$/i -FALSE_REGEXP = /^(false|inactive|0|0.0|low tox)$/i +TRUE_REGEXP = /^(true|active|1|1.0|tox|activating)$/i +FALSE_REGEXP = /^(false|inactive|0|0.0|low tox|deactivating)$/i # Task durations DEFAULT_TASK_MAX_DURATION = 36000 diff --git a/lib/serializer.rb b/lib/serializer.rb index d53f7fb..3921784 100644 --- a/lib/serializer.rb +++ b/lib/serializer.rb @@ -192,7 +192,7 @@ module OpenTox @object[metadata[OT.featureDataset]] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Dataset }] } @object[metadata[OT.trainingDataset]] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Dataset }] } @object[metadata[OT.dependentVariables]] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Feature }] } - metadata[OT.predictedVariables].each{|feature| @object[feature] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Feature }]}} unless metadata[OT.predictedVariables].nil? + metadata[OT.predictedVariables].each{|feature| @object[feature] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Feature }]}} #unless metadata[OT.predictedVariables].nil? # TODO: add algorithms from parameters @object["http://ot-dev.in-silico.ch/algorithm/fminer/bbrc"] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Algorithm }] } @object["http://ot-dev.in-silico.ch/algorithm/fminer/last"] = { RDF["type"] => [{ "type" => "uri", "value" => OT.Algorithm }] } |