separate csv serialisations for batch predictions and training data, repeated measurements in mutagenicity dataset fixed, daphnia import fixed, CENTRAL_MONGO_IP removed

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index 72c26d7..296a174 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -18,6 +18,9 @@ module OpenTox
   # Confidence
   class Confidence < Feature
     field :dataset_id, type: BSON::ObjectId
+    def name
+      "Confidence"
+    end
   end
 
   # Categorical variables
@@ -66,13 +69,13 @@ module OpenTox
     field :model_id, type: BSON::ObjectId
     field :training_feature_id, type: BSON::ObjectId
     def name
-      "#{self[:name]} Prediction"
+      "Prediction: #{self[:name]}"
     end
   end
 
   class LazarPredictionProbability < NominalLazarPrediction
     def name
-      "probability(#{self[:name]})"
+      "Probability: #{self[:name]}"
     end
   end
 
@@ -81,13 +84,13 @@ module OpenTox
     field :model_id, type: BSON::ObjectId
     field :training_feature_id, type: BSON::ObjectId
     def name
-      "#{self[:name]} Prediction"
+      "Prediction: #{self[:name]}"
     end
   end
 
   class LazarPredictionInterval < NumericLazarPrediction
     def name
-      "prediction_interval_#{self[:name]}"
+      "#{self[:name].capitalize} prediction interval"
     end
   end