Changeset 15939

Timestamp:

05/21/18 15:24:15 (6 years ago)

Author:

pfleck

Message:

#2906 Added backwards compatability

Location:

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

Files:

• LinearTransformation.cs (modified) (1 diff)
• LogarithmTransformation.cs (modified) (2 diffs)
• RescaleTransformation.cs (modified) (1 diff)

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

@@ -74 +74 @@
       : base(deserializing) {
     }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (Parameters.TryGetValue("Slope", out IParameter slopeParameter)) {
+        Parameters.Add(new FixedValueParameter<DoubleValue>("Scale", "Multiplicative factor (Slope)", ((IValueParameter<DoubleValue>)slopeParameter).Value));
+        Parameters.Remove("Slope");
+      }
+      if (Parameters.TryGetValue("Intercept", out IParameter interceptParameter)) {
+        Parameters.Add(new FixedValueParameter<DoubleValue>("Offset", "Additive factor (Intercept)", ((IValueParameter<DoubleValue>)interceptParameter).Value));
+        Parameters.Remove("Intercept");
+      }
+    }
     #endregion
+
 
     public override IEnumerable<double> Apply(IEnumerable<double> data) {

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

@@ -71 +71 @@
       : base(deserializing) {
     }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey("Offset"))
+        Parameters.Add(new FixedValueParameter<DoubleValue>("Offset", "Offset before the logarithm", new DoubleValue(0.0)));
+    }
     #endregion
+
 
     public override bool Check(IEnumerable<double> data, out string errorMessage) {
@@ -95 +101 @@
 
     public static IEnumerable<double> InverseApply(IEnumerable<double> data, double @base = Math.E, double offset = 0.0) {
-      return ExponentialTransformation.InverseApply(data, @base).Select(x => x - offset);
+      return ExponentialTransformation.Apply(data, @base).Select(x => x - offset);
     }
   }

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

@@ -121 +121 @@
       if (double.IsNaN(originalMax)) originalMax = data.Max();
 
-      GetLinearTransformationParameters(targetMin, targetMax, originalMin, originalMax, out double scale, out double offset);
+      var originalRange = originalMax - originalMin;
+      var targetRange = targetMax - targetMin;
 
-      return LinearTransformation.Apply(data, scale, offset);
+      return data
+        .Select(x => (x - originalMin) / originalRange) // scale to [0-1]
+        .Select(x => x * targetRange + targetMin);
     }
 
     public static IEnumerable<double> InverseApply(IEnumerable<double> data, double targetMin, double targetMax, double originalMin, double originalMax) {
-      GetLinearTransformationParameters(targetMin, targetMax, originalMin, originalMax, out double scale, out double offset);
-
-      return LinearTransformation.InverseApply(data, scale, offset);
-    }
-
-    private static void GetLinearTransformationParameters(double targetMin, double targetMax, double originalMin, double originalMax,
-        out double scale, out double offset) {
-      var originalRange = originalMax - originalMin;
-      var targetRange = targetMax - targetMin;
-
-      scale = targetRange / originalRange;
-      offset = targetMin - originalMin * scale;
+      return Apply(data, originalMin, originalMax, targetMin, targetMax);
     }
   }