Changeset 15870 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisTransformation.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/DataAnalysisTransformation.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -40 +39 @@
     }
 
-    private IValueParameter<ITransformation> TransformationParameter {
-      get { return (IValueParameter<ITransformation>)Parameters["Transformation"]; }
+    private ValueParameter<ITransformation> TransformationParameter {
+      get { return (ValueParameter<ITransformation>)Parameters["Transformation"]; }
     }
     #endregion
@@ -48 +47 @@
     public string OriginalVariable {
       get { return OriginalVariableParameter.Value.Value; }
-      set { OriginalVariableParameter.Value.Value = value; }
     }
 
     public string TransformedVariable {
       get { return TransformedVariableParameter.Value.Value; }
-      set { TransformedVariableParameter.Value.Value = value; }
     }
 
     public ITransformation Transformation {
       get { return TransformationParameter.Value; }
-      set { TransformationParameter.Value = value; }
     }
     #endregion
 
     #region Constructor, Cloning & Persistence
-    public DataAnalysisTransformation()
-      : this("", "", new IdentityTransformation()) {
-    }
     public DataAnalysisTransformation(string originalVariable, string transformedVariable, ITransformation transformation)
       : base() {
-      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();
+      Parameters.Add(new FixedValueParameter<StringValue>("Original Variable", new StringValue(originalVariable).AsReadOnly()));
+      Parameters.Add(new FixedValueParameter<StringValue>("Transformed Variable", new StringValue(transformedVariable).AsReadOnly()));
+      Parameters.Add(new ValueParameter<ITransformation>("Transformation", transformation)); // TODO: should be readonly/fixed
     }
 
     protected DataAnalysisTransformation(DataAnalysisTransformation original, Cloner cloner)
       : base(original, cloner) {
-      RegisterEventHandlers();
     }
 
@@ -89 +79 @@
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEventHandlers();
-    }
-    #endregion
-
-    #region Event-Handling
-    private void RegisterEventHandlers() {
-      OriginalVariableParameter.Value.ValueChanged += OriginalVariableParameterValue_ValueChanged;
-      TransformedVariableParameter.Value.ValueChanged += TransformedVariableParameterValue_ValueChanged;
-      TransformationParameter.ValueChanged += TransformationParameter_ValueChanged;
-    }
-
-    private void OriginalVariableParameterValue_ValueChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
-    private void TransformedVariableParameterValue_ValueChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
-    private void TransformationParameter_ValueChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
     #endregion