Changeset 15865 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/27/18 15:46:12 (7 years ago)

Author:

pfleck

Message:

#2906 Added PreprocessingTransformation as a custom view-model for transformations in preprocessing.

Location:

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

Files:

• DataAnalysisTransformation.cs (modified) (6 diffs)
• Transformations/ExponentialTransformation.cs (modified) (3 diffs)
• Transformations/LinearTransformation.cs (modified) (1 diff)
• Transformations/LogarithmTransformation.cs (modified) (1 diff)
• Transformations/ZNormalizationTransformation.cs (modified) (4 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +31 @@
   [StorableClass]
   public class DataAnalysisTransformation : ParameterizedNamedItem, IDataAnalysisTransformation {
-    #region Parameters
-    public IConstrainedValueParameter<StringValue> OriginalVariableParameter {
-      get { return (IConstrainedValueParameter<StringValue>)Parameters["Original Variable"]; }
+    #region Parameter Properties
+    private IFixedValueParameter<StringValue> OriginalVariableParameter {
+      get { return (IFixedValueParameter<StringValue>)Parameters["Original Variable"]; }
     }
 
-    public IConstrainedValueParameter<StringValue> TransformedVariableParameter {
-      get { return (IConstrainedValueParameter<StringValue>)Parameters["Transformed Variable"]; }
+    private IFixedValueParameter<StringValue> TransformedVariableParameter {
+      get { return (IFixedValueParameter<StringValue>)Parameters["Transformed Variable"]; }
     }
 
-    public IValueParameter<ITransformation> TransformationParameter {
+    private IValueParameter<ITransformation> TransformationParameter {
       get { return (IValueParameter<ITransformation>)Parameters["Transformation"]; }
     }
@@ -51 +48 @@
     public string OriginalVariable {
       get { return OriginalVariableParameter.Value.Value; }
-      set { SetConstrainedValue(OriginalVariableParameter, value); }
+      set { OriginalVariableParameter.Value.Value = value; }
     }
 
     public string TransformedVariable {
       get { return TransformedVariableParameter.Value.Value; }
-      set { SetConstrainedValue(TransformedVariableParameter, value); }
+      set { TransformedVariableParameter.Value.Value = value; }
     }
 
@@ -63 +60 @@
       set { TransformationParameter.Value = value; }
     }
-
-    private static void SetConstrainedValue(IConstrainedValueParameter<StringValue> parameter, string value, [CallerMemberName] string caller = null) {
-      if (value == null) throw new ArgumentNullException(caller);
-      if (value == parameter.Value.Value) return;
-
-      var matchingValue = parameter.ValidValues.SingleOrDefault(v => v.Value == value);
-      if (matchingValue == null) throw new ArgumentException("The provided value is not valid.", caller);
-      parameter.Value = matchingValue;
-    }
     #endregion
 
     #region Constructor, Cloning & Persistence
-    public DataAnalysisTransformation(IEnumerable<StringValue> variableNames)
+    public DataAnalysisTransformation()
+      : this("", "", new IdentityTransformation()) {
+    }
+    public DataAnalysisTransformation(string originalVariable, string transformedVariable, ITransformation transformation)
       : base() {
-      var originalVariables = new ItemSet<StringValue>(variableNames.Select(x => x.AsReadOnly()));
-      var transformedVariables = new ItemSet<StringValue>(variableNames.Select(x => x.AsReadOnly()));
-      Parameters.Add(new ConstrainedValueParameter<StringValue>("Original Variable", new ItemSet<StringValue>(originalVariables), originalVariables.FirstOrDefault()));
-      Parameters.Add(new ConstrainedValueParameter<StringValue>("Transformed Variable", new ItemSet<StringValue>(transformedVariables), transformedVariables.FirstOrDefault()));
-
-      //var transformations = new ItemSet<ITransformation>(ApplicationManager.Manager.GetInstances<ITransformation>());
-      Parameters.Add(new ValueParameter<ITransformation>("Transformation", new IdentityTransformation()));
+      Parameters.Add(new FixedValueParameter<StringValue>("Original Variable", new StringValue(originalVariable)));
+      Parameters.Add(new FixedValueParameter<StringValue>("Transformed Variable", new StringValue(transformedVariable)));
+      Parameters.Add(new ValueParameter<ITransformation>("Transformation", transformation));
 
       RegisterEventHandlers();
@@ -109 +96 @@
     #region Event-Handling
     private void RegisterEventHandlers() {
-      OriginalVariableParameter.ValueChanged += OriginalVariableParameter_ValueChanged;
-      TransformedVariableParameter.ValueChanged += TransformedVariableParameter_ValueChanged;
+      OriginalVariableParameter.Value.ValueChanged += OriginalVariableParameterValue_ValueChanged;
+      TransformedVariableParameter.Value.ValueChanged += TransformedVariableParameterValue_ValueChanged;
       TransformationParameter.ValueChanged += TransformationParameter_ValueChanged;
     }
 
-    private void OriginalVariableParameter_ValueChanged(object sender, EventArgs e) {
-      OriginalVariableParameter.Value.ValueChanged += OriginalVariableParameterValue_ValueChanged;
-      OnToStringChanged();
-    }
     private void OriginalVariableParameterValue_ValueChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
-
-    private void TransformedVariableParameter_ValueChanged(object sender, EventArgs e) {
-      TransformedVariableParameter.Value.ValueChanged += TransformedVariableParameterValue_ValueChanged;
       OnToStringChanged();
     }
@@ -129 +107 @@
       OnToStringChanged();
     }
-
     private void TransformationParameter_ValueChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }
     #endregion
-
 
     public override string ToString() {

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs

@@ -49 +49 @@
     public ExponentialTransformation()
       : base() {
-      Parameters.Add(new FixedValueParameter<DoubleValue>("Base", "Base the logarithm", new DoubleValue(Math.E)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("Base", "", new DoubleValue(Math.E)));
     }
 
@@ -65 +65 @@
     #endregion
 
-    public override bool Check(IEnumerable<double> data, out string errorMessage) {
-      if (data.Any(x => x <= 0)) {
-        errorMessage = "Log is not available for zero or negative values";
-        return false;
-      }
-      return base.Check(data, out errorMessage);
-    }
-
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
       return Apply(data, Base);
@@ -80 +72 @@
       return InverseApply(data, Base);
     }
+
 
     public static IEnumerable<double> Apply(IEnumerable<double> data, double @base = Math.E) {

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs

@@ -46 +46 @@
     public double Slope {
       get { return SlopeParameter.Value.Value; }
-      set { SlopeParameter.Value.Value = value; }
+      set { SlopeParameter.Value.Value = value; } //TODO: check for != 0?
     }
 

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmTransformation.cs

@@ -81 +81 @@
     }
 
+
     public static IEnumerable<double> Apply(IEnumerable<double> data, double @base = Math.E) {
       return data.Select(x => Math.Log(x, @base));

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ZNormalizationTransformation.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [Item("Z-Score Normalization", "Z-Score normalization transformation to standardize (target_mu = 0, target_sigma = 1) the values")]
+  [Item("Z-Score Normalization", "Z-Score normalization transformation to standardize the values to a Target Mean and Target Standard Deviation.")]
   [StorableClass]
   public class ZNormalizationTransformation : Transformation<double> {
@@ -58 +58 @@
     public double OriginalMean {
       get { return OriginalMeanParameter.Value.Value; }
-      set { OriginalMeanParameter.Value.Value = value; }
+      private set { OriginalMeanParameter.Value.Value = value; }
     }
     public double OriginalStandardDeviation {
       get { return OriginalStandardDeviationParameter.Value.Value; }
-      set { OriginalStandardDeviationParameter.Value.Value = value; }
+      private set { OriginalStandardDeviationParameter.Value.Value = value; }
     }
     #endregion
@@ -103 +103 @@
 
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
-      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation))
+      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation)) //TODO isConfigured field?
         Configure(data);
 
@@ -112 +112 @@
       return InverseApply(data, TargetMean, TargetStandardDeviation, OriginalMean, OriginalStandardDeviation);
     }
+
 
     public static IEnumerable<double> Apply(IEnumerable<double> data, double targetMean, double targetStandardDeviation, double originalMean = double.NaN, double originalStandardDeviation = double.NaN) {