Changeset 10980

Timestamp:

06/11/14 13:29:00 (10 years ago)

Author:

pfleck

Message:

• Inverse iterate when backtransforming model
• Insert CopyColumnTransformation in front of Transformations-List

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs

@@ -119 +119 @@
 
         var copyTransformation = CreateCopyTransformation(oldName, newName);
-        preprocessingData.Transformations.Add(copyTransformation);
-
+        preprocessingData.Transformations.Insert(0, copyTransformation);
       }
-
-      //var transformedColumns = transformations.Select(x => x.Column).Distinct();
-      //foreach (var column in transformedColumns) {
-      //  var copyTransformation = CreateCopyTransformation(column);
-      //  preprocessingData.Transformations.Add(copyTransformation);
-      //}
     }
 

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs

@@ -37 +37 @@
       var symbolicModel = (ISymbolicDataAnalysisModel)model;
 
-      foreach (var transformation in transformations) {
+      foreach (var transformation in transformations.Reverse()) {
         ApplyBacktransformation(transformation, symbolicModel.SymbolicExpressionTree, targetVariable);
       }
@@ -48 +48 @@
           .Where(n => n.VariableName == transformation.Column);
         ApplyRegularBacktransformation(transformation, variableNodes);
-      } else {
+      } else if (!(transformation is CopyColumnTransformation)) {
         ApplyInverseBacktransformation(transformation, symbolicExpressionTree);
       }