1 files changed, 25 insertions, 9 deletions
diff --git a/lib/feature.rb b/lib/feature.rb
index 2c10c26..056957b 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -1,32 +1,46 @@
 module OpenTox
 
-  # Basic feature class
-  class Feature
-  end
-
   # Original ID (e.g. from CSV input)
   class OriginalId < Feature
     field :dataset_id, type: BSON::ObjectId
   end
 
-  # Feature for categorical variables
+  # Original SMILES (e.g. from CSV input)
+  class OriginalSmiles < Feature
+    field :dataset_id, type: BSON::ObjectId
+  end
+
+  # Warnings
+  class Warnings < Feature
+    field :dataset_id, type: BSON::ObjectId
+  end
+
+  # Categorical variables
   class NominalFeature < Feature
     field :accept_values, type: Array
   end
 
-  # Feature for quantitative variables
+  # Quantitative variables
   class NumericFeature < Feature
     field :unit, type: String
   end
 
   # Nominal biological activity
   class NominalBioActivity < NominalFeature
-    field :original_feature_id, type: BSON::ObjectId
-    field :transformation, type: Hash
   end
 
   # Numeric biological activity
   class NumericBioActivity < NumericFeature
+  end
+
+  # Transformed nominal biological activity
+  class TransformedNominalBioActivity < NominalFeature
+    field :original_feature_id, type: BSON::ObjectId
+    field :transformation, type: Hash
+  end
+
+  # Transformed numeric biological activity
+  class TransformedNumericBioActivity < NumericFeature
     field :original_feature_id, type: BSON::ObjectId
     field :transformation, type: String
   end
@@ -38,7 +52,6 @@ module OpenTox
   end
 
   class LazarPredictionProbability < NominalLazarPrediction
-    field :value, type: Float
   end
 
   # Numeric lazar prediction
@@ -47,6 +60,9 @@ module OpenTox
     field :training_feature_id, type: BSON::ObjectId
   end
 
+  class LazarConfidenceInterval < NumericLazarPrediction
+  end
+
   class NominalSubstanceProperty < NominalFeature
   end