Changeset 15884 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Timestamp:

04/04/18 17:18:02 (7 years ago)

Author:

pfleck

Message:

#2906 Refactoring

• Moved transformation-specific parts out of existing interfaces.
• Moved all Transformation logic to DataAnalysisTransformation.
• Simplified (Inverse)Transformation of Dataset/ProblemData/Model/Solution.

Location:

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Files:

• RegressionProblemData.cs (modified) (1 diff)
• RegressionTransformationModel.cs (modified) (4 diffs)

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -180 +180 @@
       base.AdjustProblemDataProperties(problemData);
     }
-
-    public override IDataAnalysisProblemData Transform() {
-      var transformedProblemData = (IRegressionProblemData)base.Transform();
-      var targetVariable = RegressionTransformationModel.GetTransformedTragetVariable(TargetVariable, Transformations);
-      transformedProblemData.TargetVariable = targetVariable;
-      return transformedProblemData;
-    }
-
-    public override IDataAnalysisProblemData InverseTransform() {
-      var transformedProblemData = (IRegressionProblemData)base.InverseTransform();
-      var targetVariable = RegressionTransformationModel.GetOriginalTragetVariable(TargetVariable, Transformations);
-      transformedProblemData.TargetVariable = targetVariable;
-      return transformedProblemData;
-    }
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionTransformationModel.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36 +35 @@
     }
 
+    IEnumerable<IDataAnalysisTransformation> IRegressionTransformationModel.TargetTransformations {
+      get { return TargetTransformations; }
+    }
+
     #region Constructor, Cloning & Persistence
     public RegressionTransformationModel(IRegressionModel originalModel, IEnumerable<IDataAnalysisTransformation> transformations)
       : base(originalModel, transformations) {
-      var transitiveTargets = CalculateTransitiveVariables(new[] { originalModel.TargetVariable }, transformations);
+      var transitiveTargets = DataAnalysisTransformation.GetTransitiveVariables(new[] { originalModel.TargetVariable }, transformations, inverse: true).ToList();
       TargetTransformations = new ItemList<IDataAnalysisTransformation>(transformations.Where(t => transitiveTargets.Contains(t.OriginalVariable))).AsReadOnly();
-      TargetVariable = GetOriginalTragetVariable(originalModel.TargetVariable, TargetTransformations);
+      TargetVariable = DataAnalysisTransformation.GetLastTransitiveVariable(originalModel.TargetVariable, TargetTransformations, inverse: true);
     }
 
     protected RegressionTransformationModel(RegressionTransformationModel original, Cloner cloner)
       : base(original, cloner) {
-      
     }
 
@@ -59 +61 @@
 
     public virtual IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
-      var estimates = OriginalModel.GetEstimatedValues(Transform(dataset, InputTransformations), rows);
-      return InverseTransform(estimates, TargetTransformations, OriginalModel.TargetVariable);
+      var transformedInput = DataAnalysisTransformation.Transform(dataset, InputTransformations);
+      var estimates = OriginalModel.GetEstimatedValues(transformedInput, rows);
+      return InverseTransform(estimates, TargetTransformations);
     }
 
@@ -67 +70 @@
     }
 
-    public static IEnumerable<double> InverseTransform(IEnumerable<double> data, IEnumerable<IDataAnalysisTransformation> transformations, string targetVariable) {
-      var estimates = data.ToList();
-
-      foreach (var transformation in transformations.Reverse()) {
-        if (transformation.TransformedVariable == targetVariable) {
-          var trans = (ITransformation<double>)transformation.Transformation;
-
-          estimates = trans.InverseApply(estimates).ToList();
-
-          // setup next iteration
-          targetVariable = transformation.OriginalVariable;
-        }
+    protected static IEnumerable<double> InverseTransform(IEnumerable<double> data, IEnumerable<IDataAnalysisTransformation> transformations) {
+      foreach (var transformation in transformations.Reverse()) { // TargetTransformations only contains only relevant transformations
+        var trans = (ITransformation<double>)transformation.Transformation;
+        data = trans.InverseApply(data).ToList();
       }
-
-      return estimates;
-    }
-
-    public static string GetTransformedTragetVariable(string originalTarget, IEnumerable<IDataAnalysisTransformation> transformations) {
-      var transformedTarget = originalTarget;
-      foreach (var transformation in transformations) {
-        if (transformation.OriginalVariable == transformedTarget)
-          transformedTarget = transformation.TransformedVariable;
-      }
-      return transformedTarget;
-    }
-
-    public static string GetOriginalTragetVariable(string transformedTarget, IEnumerable<IDataAnalysisTransformation> transformations) {
-      var originalTarget = transformedTarget;
-      foreach (var transformation in transformations.Reverse()) {
-        if (transformation.TransformedVariable == originalTarget)
-          originalTarget = transformation.OriginalVariable;
-      }
-      return originalTarget;
+      return data;
     }
   }