Changeset 10994

Timestamp:

06/11/14 15:15:54 (10 years ago)

Author:

tsteinre

Message:

• Partition Ranges are not computed anymore: save the concrete values in PreprocessingData.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations

Files:

• PreprocessingData.cs (modified) (4 diffs)
• TransactionalPreprocessingData.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

@@ -35 +35 @@
   public abstract class PreprocessingData : NamedItem, IPreprocessingData {
 
-    protected double trainingToTestRatio;
-    public IntRange TrainingPartition {
-      get { return new IntRange(0, (int)(Rows * trainingToTestRatio)); }
-    }
-    public IntRange TestPartition {
-      get { return new IntRange((int)(Rows * trainingToTestRatio), Rows); }
-    }
+    public IntRange TrainingPartition { get; set; }
+    public IntRange TestPartition { get; set; }
 
     protected IList<ITransformation> transformations;
@@ -86 +81 @@
       variableValues = CopyVariableValues(original.variableValues);
       variableNames = new List<string>(original.variableNames);
-      trainingToTestRatio = original.trainingToTestRatio;
+      TrainingPartition = (IntRange)original.TrainingPartition.Clone(cloner);
+      TestPartition = (IntRange)original.TestPartition.Clone(cloner);
       transformations = new List<ITransformation>();
+
+      RegisterEventHandler();
     }
 
@@ -114 +112 @@
       }
 
-      trainingToTestRatio = (double)problemData.TrainingPartition.Size / Math.Max(problemData.Dataset.Rows, double.Epsilon);
+      TrainingPartition = new IntRange(problemData.TrainingPartition.Start, problemData.TrainingPartition.End);
+      TestPartition = new IntRange(problemData.TestPartition.Start, problemData.TestPartition.End);
+      
+      RegisterEventHandler();
+    }
+
+    private void RegisterEventHandler() {
+      Changed += (s, e) => {
+        switch (e.Type) {
+          case DataPreprocessingChangedEventType.DeleteRow:
+            CheckPartitionRanges();
+            break;
+          case DataPreprocessingChangedEventType.Any:
+            CheckPartitionRanges();
+            break;
+          case DataPreprocessingChangedEventType.Transformation:
+            CheckPartitionRanges();
+            break;
+        }
+      };
     }
 
@@ -125 +142 @@
     }
 
+    private void CheckPartitionRanges() {
+      int maxRowIndex = Math.Max(0, Rows - 1);
+      TrainingPartition.Start = Math.Min(TrainingPartition.Start, maxRowIndex);
+      TrainingPartition.End = Math.Min(TrainingPartition.End, maxRowIndex);
+      TestPartition.Start = Math.Min(TestPartition.Start, maxRowIndex);
+      TestPartition.End = Math.Min(TestPartition.End, maxRowIndex);
+    }
+
     protected IList<IList> CopyVariableValues(IList<IList> original) {
       var copy = new List<IList>(original);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Transformations;
@@ -37 +38 @@
       public IList<string> VariableNames { get; set; }
 
-      public double TrainingToTestRatio { get; set; }
+      public IntRange TrainingPartition { get; set; }
+      public IntRange TestPartition { get; set; }
       public IList<ITransformation> Transformations { get; set; }
       public DataPreprocessingChangedEventType ChangedType { get; set; }
@@ -66 +68 @@
         VariableValues = CopyVariableValues(variableValues),
         VariableNames = new List<string>(variableNames),
-        TrainingToTestRatio = trainingToTestRatio,
+        TrainingPartition = new IntRange(TrainingPartition.Start, TrainingPartition.End),
+        TestPartition = new IntRange(TestPartition.Start, TestPartition.End),
         Transformations = new List<ITransformation>(transformations),
         ChangedType = changedType,
@@ -235 +238 @@
         variableValues = previousSnapshot.VariableValues;
         variableNames = previousSnapshot.VariableNames;
-        trainingToTestRatio = previousSnapshot.TrainingToTestRatio;
+        TrainingPartition = previousSnapshot.TrainingPartition;
+        TestPartition = previousSnapshot.TestPartition;
         transformations = previousSnapshot.Transformations;
         undoHistory.Remove(previousSnapshot);