Changeset 15848 for branches

Timestamp:

03/20/18 12:28:16 (7 years ago)

Author:

pfleck

Message:

#2906 Added TransformedModelView, implemented "remove virtual columns"

Location:

branches/2906_Transformations

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/TransformedRegressionModelView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/TransformedRegressionModelView.cs (added)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/ITransformedRegressionModel.cs (modified) (1 diff)

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -432 +432 @@
       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Regression\TransformedRegressionModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\TransformedRegressionModelView.Designer.cs">
+      <DependentUpon>TransformedRegressionModelView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Solution Views\ClassificationSolutionView.cs">
       <SubType>UserControl</SubType>

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -273 +273 @@
     }
 
-    public static IDataset InverseTransform(IDataset dataset, IEnumerable<IDataAnalysisTransformation> transformations) {
+    public static IDataset InverseTransform(IDataset dataset, IEnumerable<IDataAnalysisTransformation> transformations, bool removeVirtualVariables = true) {
       var modifiableDataset = ((Dataset)dataset).ToModifiable();
 
-      foreach (var transformation in transformations.Reverse()) {
+      var transformationsStack = new Stack<IDataAnalysisTransformation>(transformations);
+      while (transformationsStack.Any()) {
+        var transformation = transformationsStack.Pop();
         var trans = (ITransformation<double>)transformation.Transformation;
 
@@ -283 +285 @@
         var originalData = trans.InverseApply(transformedData).ToList();
         modifiableDataset.ReplaceVariable(transformation.OriginalVariable, originalData);
+
+        bool transformedVariablePending = transformationsStack.Any(x => x.OriginalVariable == transformation.TransformedVariable);
+        if (removeVirtualVariables && !transformedVariablePending)
+          modifiableDataset.RemoveVariable(transformation.TransformedVariable);
       }
 

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/ITransformedRegressionModel.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
+
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface ITransformedRegressionModel : IRegressionModel {
+
     IRegressionModel OriginalModel { get; }
+
+    ItemList<IDataAnalysisTransformation> Transformations { get; }
   }
 }