From 1c74a684b8b2992d7e6fce5f1a4677d397ec4dd6 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Sat, 18 Jul 2015 08:52:39 +0200
Subject: dataset tests pass

---
 lib/feature.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib/feature.rb')

diff --git a/lib/feature.rb b/lib/feature.rb
index 5d3d962..43cf7e9 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -2,13 +2,18 @@ module OpenTox
 
   class Feature
 
+    field :string, type: Boolean, default: false
+    field :nominal, type: Boolean, default: false
+    field :numeric, type: Boolean, default: false
+    field :accept_values, type: Array
+    
     # Find out feature type
     # Classification takes precedence
     # @return [String] Feature type
     def feature_type
-      if self[RDF.type].include?(RDF::OT.NominalFeature)
+      if nominal
         "classification"
-      elsif self[RDF.type].include?(RDF::OT.NumericFeature)
+      elsif numeric
         "regression"
       else
         "unknown"
@@ -18,9 +23,9 @@ module OpenTox
     # Get accept values
     # 
     # @return[Array] Accept values
-    def accept_values
-      self[RDF::OT.acceptValue] ? self[RDF::OT.acceptValue].sort : nil
-    end
+    #def accept_values
+      #self[RDF::OT.acceptValue] ? self[RDF::OT.acceptValue].sort : nil
+    #end
 
     # Create value map
     # @param [OpenTox::Feature] Feature
-- 
cgit v1.2.3