lib/feature.rb in lazar-0.9.3 vs lib/feature.rb in lazar-1.0.0

@@ -1,45 +1,38 @@
 module OpenTox
 
   # Basic feature class
   class Feature
-    field :nominal, type: Boolean
-    field :numeric, type: Boolean
     field :measured, type: Boolean
     field :calculated, type: Boolean
+    field :category, type: String
+    field :unit, type: String
+    field :conditions, type: Hash
+
+    def nominal?
+      self.class == NominalFeature
+    end
+
+    def numeric?
+      self.class == NumericFeature
+    end
   end
 
   # Feature for categorical variables
   class NominalFeature < Feature
     field :accept_values, type: Array
-    def initialize params
-      super params
-      nominal = true
-    end
   end
 
   # Feature for quantitative variables
   class NumericFeature < Feature
-    def initialize params
-      super params
-      numeric = true
-    end
   end
 
   # Feature for SMARTS fragments
   class Smarts < NominalFeature
     field :smarts, type: String 
     index "smarts" => 1
     def self.from_smarts smarts
       self.find_or_create_by :smarts => smarts
     end
-  end
-
-  # Feature for categorical bioassay results
-  class NominalBioAssay < NominalFeature
-  end
-
-  # Feature for quantitative bioassay results
-  class NumericBioAssay < NumericFeature
   end
 
 end