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

Timestamp:

03/28/18 17:17:31 (6 years ago)

Author:

pfleck

Message:

#2906

• Implemented for classification, clustering, etc.
• Simplified Transformation interfaces (read-only, ...).
• Started moving transformation logic out of ProblemData.

File:

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

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

@@ -243 +243 @@
 
     public virtual IDataAnalysisProblemData Transform() {
-      var newDataset = Transform(Dataset, Transformations);
+      var newDataset = DataAnalysisTransformationModel.Transform(Dataset, Transformations);
 
       var extendedInputs = ExtendInputVariables(AllowedInputVariables, Transformations);
@@ -253 +253 @@
       cloner.RegisterClonedObject(Dataset, newDataset);
       cloner.RegisterClonedObject(InputVariables, checkedInputs.AsReadOnly());
-      //cloner.RegisterClonedObject(TransformationsParameter.Value, new ItemList<IDataAnalysisTransformation>(transformations).AsReadOnly());
+      // TODO: valid values for target are not extended
 
       return cloner.Clone(this);
@@ -268 +268 @@
       cloner.RegisterClonedObject(Dataset, newDataset);
       cloner.RegisterClonedObject(InputVariables, checkedInputs.AsReadOnly());
-      //cloner.RegisterClonedObject(TransformationsParameter.Value, new ItemList<IDataAnalysisTransformation>().AsReadOnly());
+      // TODO: check valid target values 
 
       return cloner.Clone(this);
-    }
-
-    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;
     }