Changeset 15865 for branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs

Timestamp:

03/27/18 15:46:12 (6 years ago)

Author:

pfleck

Message:

#2906 Added PreprocessingTransformation as a custom view-model for transformations in preprocessing.

File:

• branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs (modified) (8 diffs)

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs

@@ -47 +47 @@
       Name = "Preprocessing Data";
 
-      Transformations = new List<IDataAnalysisTransformation>();
+      Transformations = new List<PreprocessingTransformation>();
       selection = new Dictionary<int, IList<int>>();
 
@@ -61 +61 @@
       TrainingPartition = (IntRange)original.TrainingPartition.Clone(cloner);
       TestPartition = (IntRange)original.TestPartition.Clone(cloner);
-      Transformations = new List<IDataAnalysisTransformation>(original.Transformations.Select(cloner.Clone));
+      Transformations = new List<PreprocessingTransformation>(original.Transformations.Select(cloner.Clone));
 
       InputVariables = new List<string>(original.InputVariables);
@@ -350 +350 @@
     #region Transformations
     [Storable]
-    public IList<IDataAnalysisTransformation> Transformations { get; protected set; }
+    public IList<PreprocessingTransformation> Transformations { get; protected set; }
     #endregion
 
@@ -414 +414 @@
       }
 
+      // TODO: set fixed constrained (allowed) values
+      foreach (var trans in problemData.Transformations) {
+        var newTrans = new PreprocessingTransformation(variableNames.Select(x => new StringValue(x))) {
+          OriginalVariable = trans.OriginalVariable,
+          TransformedVariable = trans.TransformedVariable,
+          IsApplied = true
+        };
+        var cloned = (ITransformation)trans.Transformation.Clone();
+        newTrans.TransformationParameter.ValidValues.Add(cloned);
+        newTrans.Transformation = cloned;
+        Transformations.Add(newTrans);
+      }
+
       TrainingPartition = new IntRange(problemData.TrainingPartition.Start, problemData.TrainingPartition.End);
       TestPartition = new IntRange(problemData.TestPartition.Start, problemData.TestPartition.End);
@@ -459 +472 @@
       public IntRange TrainingPartition { get; set; }
       public IntRange TestPartition { get; set; }
-      public IList<IDataAnalysisTransformation> Transformations { get; set; }
+      public IList<PreprocessingTransformation> Transformations { get; set; }
       public DataPreprocessingChangedEventType ChangedType { get; set; }
 
@@ -487 +500 @@
         TrainingPartition = new IntRange(TrainingPartition.Start, TrainingPartition.End),
         TestPartition = new IntRange(TestPartition.Start, TestPartition.End),
-        Transformations = new List<IDataAnalysisTransformation>(Transformations),
+        Transformations = new List<PreprocessingTransformation>(Transformations),
         ChangedType = changedType,
         ChangedColumn = column,
@@ -682 +695 @@
       l = 0;
       ir = n - 1;
-      for (;;) {
+      for (; ; ) {
         if (ir <= l + 1) {
           // Active partition contains 1 or 2 elements.
@@ -707 +720 @@
           j = ir;
           a = arr[l + 1]; // Partitioning element.
-          for (;;) { // Beginning of innermost loop.
+          for (; ; ) { // Beginning of innermost loop.
             do i++; while (arr[i].CompareTo(a) < 0); // Scan up to find element > a.
             do j--; while (arr[j].CompareTo(a) > 0); // Scan down to find element < a.