Changeset 15884 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.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/DataAnalysisProblemData.cs (modified) (1 diff)

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

@@ -241 +241 @@
       }
     }
-
-    public virtual IDataAnalysisProblemData Transform() {
-      var newDataset = DataAnalysisTransformationModel.Transform(Dataset, Transformations);
-
-      var extendedInputs = DataAnalysisTransformationModel.ExtendInputVariables(AllowedInputVariables, Transformations);
-      var checkedInputs = new CheckedItemList<StringValue>(newDataset.VariableNames.Select(x => new StringValue(x)));
-      foreach (var input in checkedInputs) checkedInputs.SetItemCheckedState(input, extendedInputs.Contains(input.Value));
-
-      // TODO: Cannot create concrete instance here (maybe derived Create-method?)
-      var cloner = new Cloner();
-      cloner.RegisterClonedObject(Dataset, newDataset);
-      cloner.RegisterClonedObject(InputVariables, checkedInputs.AsReadOnly());
-      // TODO: valid values for target are not extended
-
-      return cloner.Clone(this);
-    }
-
-    public virtual IDataAnalysisProblemData InverseTransform() {
-      var newDataset = InverseTransform(Dataset, Transformations);
-
-      var checkedInputs = new CheckedItemList<StringValue>(newDataset.VariableNames.Select(x => new StringValue(x)));
-      foreach (var input in checkedInputs) checkedInputs.SetItemCheckedState(input, AllowedInputVariables.Contains(input.Value));
-
-      // TODO: Cannot create concrete instance here (maybe derived Create-method?)
-      var cloner = new Cloner();
-      cloner.RegisterClonedObject(Dataset, newDataset);
-      cloner.RegisterClonedObject(InputVariables, checkedInputs.AsReadOnly());
-      // TODO: check valid target values 
-
-      return cloner.Clone(this);
-    }
-
-    public static IDataset InverseTransform(IDataset dataset, IEnumerable<IDataAnalysisTransformation> transformations, bool removeVirtualVariables = true) {
-      var modifiableDataset = ((Dataset)dataset).ToModifiable();
-
-      var transformationsStack = new Stack<IDataAnalysisTransformation>(transformations);
-      while (transformationsStack.Any()) {
-        var transformation = transformationsStack.Pop();
-        var trans = (ITransformation<double>)transformation.Transformation;
-
-        var prevTransformations = transformations.Except(transformationsStack);
-        bool originalWasChanged = prevTransformations.Any(x => x.TransformedVariable == transformation.OriginalVariable);
-        if (originalWasChanged) {
-          var transformedData = modifiableDataset.GetDoubleValues(transformation.TransformedVariable);
-
-          var originalData = trans.InverseApply(transformedData).ToList();
-          modifiableDataset.ReplaceVariable(transformation.OriginalVariable, originalData);
-        }
-
-        bool transformedVariablePending = transformationsStack.Any(x => x.OriginalVariable == transformation.TransformedVariable || x.TransformedVariable == transformation.TransformedVariable);
-        if (removeVirtualVariables && !transformedVariablePending)
-          modifiableDataset.RemoveVariable(transformation.TransformedVariable);
-      }
-
-      return modifiableDataset;
-    }
   }
 }