Changeset 15884 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ZNormalizationTransformation.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/Transformations/ZNormalizationTransformation.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -97 +98 @@
 
     public override void Configure(IEnumerable<double> data) {
-      OriginalMean = data.Average();
-      OriginalStandardDeviation = data.StandardDeviationPop();
+      Configure(data, out double originalMean, out double originalStandardDeviation);
+      OriginalMean = originalMean;
+      OriginalStandardDeviation = originalStandardDeviation;
       base.Configure(data);
     }
 
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
-      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation)) //TODO isConfigured field?
-        Configure(data);
+      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation))
+        throw new InvalidOperationException("Transformation is not configured");
 
       return Apply(data, TargetMean, TargetStandardDeviation, OriginalMean, OriginalStandardDeviation);
@@ -110 +112 @@
 
     public override IEnumerable<double> InverseApply(IEnumerable<double> data) {
+      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation))
+        throw new InvalidOperationException("Transformation is not configured");
+
       return InverseApply(data, TargetMean, TargetStandardDeviation, OriginalMean, OriginalStandardDeviation);
     }
 
+
+    public static void Configure(IEnumerable<double> data, out double originalMean, out double originalStandardDeviation) {
+      originalMean = data.Average();
+      originalStandardDeviation = data.StandardDeviationPop();
+    }
 
     public static IEnumerable<double> Apply(IEnumerable<double> data, double targetMean, double targetStandardDeviation, double originalMean = double.NaN, double originalStandardDeviation = double.NaN) {