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

Timestamp:

04/04/18 17:18:02 (6 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.

File:

• branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisTransformationModel.cs (modified) (3 diffs)

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

@@ -35 +35 @@
     public IDataAnalysisModel OriginalModel { get; protected set; }
 
+    IEnumerable<IDataAnalysisTransformation> IDataAnalysisTransformationModel.InputTransformations {
+      get { return InputTransformations; }
+    }
+
     [Storable]
     public ReadOnlyItemList<IDataAnalysisTransformation> InputTransformations { get; protected set; }
@@ -55 +59 @@
 
     public override IEnumerable<string> VariablesUsedForPrediction {
-      get { return OriginalModel.VariablesUsedForPrediction; /* TODO: reduce extend-inputs */}
+      get { return DataAnalysisTransformation.ReduceVariables(OriginalModel.VariablesUsedForPrediction, InputTransformations); }
     }
 
     #region Constructor, Cloning & Persistence
     protected DataAnalysisTransformationModel(IDataAnalysisModel originalModel, IEnumerable<IDataAnalysisTransformation> transformations)
-      : base(originalModel.Name) {
+      : base("Transformation Model " + originalModel.Name) {
       OriginalModel = originalModel;
-      var transitiveInputs = CalculateTransitiveVariables(originalModel.VariablesUsedForPrediction, transformations);
+      var transitiveInputs = DataAnalysisTransformation.GetTransitiveVariables(originalModel.VariablesUsedForPrediction, transformations, inverse: true);
       InputTransformations = new ItemList<IDataAnalysisTransformation>(transformations.Where(t => transitiveInputs.Contains(t.OriginalVariable))).AsReadOnly();
       TargetTransformations = new ReadOnlyItemList<IDataAnalysisTransformation>();
@@ -80 +84 @@
     #endregion
 
-    // extended -> include originals
-    public static ISet<string> CalculateTransitiveVariables(IEnumerable<string> inputVariables, IEnumerable<IDataAnalysisTransformation> transformations) {
-      var transitiveInputs = new HashSet<string>(inputVariables);
-
-      foreach (var transformation in transformations.Reverse()) {
-        if (transitiveInputs.Contains(transformation.TransformedVariable)) {
-          transitiveInputs.Add(transformation.OriginalVariable);
-        }
-      }
-
-      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;
-    }
-
-    public static IDataset Transform(IDataset dataset, IEnumerable<IDataAnalysisTransformation> transformations) {
-      var modifiableDataset = ((Dataset)dataset).ToModifiable();
-
-      foreach (var transformation in transformations) {
-        var trans = (ITransformation<double>)transformation.Transformation;
-
-        var originalData = modifiableDataset.GetDoubleValues(transformation.OriginalVariable);
-        if (!trans.Check(originalData, out string errorMessage))
-          throw new InvalidOperationException($"Cannot estimate Values, Transformation is invalid: {errorMessage}");
-
-        var transformedData = trans.Apply(originalData).ToList();
-        if (modifiableDataset.VariableNames.Contains(transformation.TransformedVariable))
-          modifiableDataset.ReplaceVariable(transformation.TransformedVariable, transformedData);
-        else
-          modifiableDataset.AddVariable(transformation.TransformedVariable, transformedData);
-      }
-
-      return modifiableDataset;
-    }
-
     #region Events
     public event EventHandler TargetVariableChanged;