development branch mergedv0.9.3

1 files changed, 1 insertions, 16 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index a308a55..b58946b 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -5,11 +5,11 @@ module OpenTox
     field :nominal, type: Boolean
     field :numeric, type: Boolean
     field :measured, type: Boolean
+    field :calculated, type: Boolean
   end
 
   # Feature for categorical variables
   class NominalFeature < Feature
-    # TODO check if accept_values are still needed 
     field :accept_values, type: Array
     def initialize params
       super params
@@ -34,21 +34,6 @@ module OpenTox
     end
   end
 
-  # Feature for supervised fragments from Fminer algorithm
-  class FminerSmarts < Smarts
-    field :p_value, type: Float
-    # TODO check if effect is used
-    field :effect, type: String
-    field :dataset_id 
-  end
-
-  # Feature for physico-chemical descriptors
-  class PhysChemDescriptor < NumericFeature
-    field :algorithm, type: String, default: "OpenTox::Algorithm::Descriptor.physchem"
-    field :parameters, type: Hash
-    field :creator, type: String
-  end
-
   # Feature for categorical bioassay results
   class NominalBioAssay < NominalFeature
   end