Changeset 15880

Timestamp:

03/30/18 15:49:51 (6 years ago)

Author:

pfleck

Message:

#2906 forgot to commit file

Location:

branches/2906_Transformations

Files:

• HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisTransformationModel.cs (modified) (4 diffs)

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs

@@ -118 +118 @@
 
     void SetAllowedInputVariables(IDataAnalysisProblemData problemData, IEnumerable<string> oldInputVariables) {
-      var inputs = DataAnalysisProblemData.ExtendInputVariables(oldInputVariables, problemData.Transformations);
+      var inputs = DataAnalysisTransformationModel.ExtendInputVariables(oldInputVariables, problemData.Transformations);
 
       foreach (var input in problemData.InputVariables) {

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

@@ -80 +80 @@
     #endregion
 
+    // extended -> include originals
     public static ISet<string> CalculateTransitiveVariables(IEnumerable<string> inputVariables, IEnumerable<IDataAnalysisTransformation> transformations) {
       var transitiveInputs = new HashSet<string>(inputVariables);
@@ -90 +91 @@
 
       return transitiveInputs;
+    }
+    // originals => include extended
+    public static IEnumerable<string> ExtendInputVariables(IEnumerable<string> oldInputVariables, IEnumerable<IDataAnalysisTransformation> transformations) {
+      var inputs = new HashSet<string>(oldInputVariables);
+
+      foreach (var transformation in transformations) {
+        if (inputs.Contains(transformation.OriginalVariable))
+          inputs.Add(transformation.TransformedVariable);
+      }
+
+      return inputs;
+    }
+    [Obsolete]
+    public static IEnumerable<string> RemoveVirtualVariables(IEnumerable<string> variables, IEnumerable<IDataAnalysisTransformation> transformations) {
+      var remainingVariables = new HashSet<string>(variables);
+
+      var transformationsStack = new Stack<IDataAnalysisTransformation>(transformations);
+
+      while (transformationsStack.Any()) {
+        var transformation = transformationsStack.Pop();
+
+
+        bool transformedVariablePending = transformationsStack.Any(x => x.OriginalVariable == transformation.TransformedVariable);
+        if (!transformedVariablePending)
+          remainingVariables.Remove(transformation.TransformedVariable);
+      }
+
+      return remainingVariables;
     }
 
@@ -112 +141 @@
     }
 
-
-
     #region Events
     public event EventHandler TargetVariableChanged;
@@ -122 +149 @@
     }
     #endregion
-
-
-
-
-
-
-    /*
-    // dataset in original data range
-    public override IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
-      var transformedDataset = Transform(dataset, Transformations);
-
-      var estimates = OriginalModel.GetEstimatedValues(transformedDataset, rows);
-
-      return InverseTransform(estimates, Transformations, OriginalModel.TargetVariable);
-    }
-
-    // problemData in original data range
-    public override IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
-      // TODO: specialized views for the original solution type are lost (RandomForestSolutionView, ...)
-      return new RegressionSolution(this, new RegressionProblemData(problemData));
-    } */
   }
 }