Changeset 7678 for trunk/sources

Timestamp:

03/30/12 23:10:26 (13 years ago)

Author:

mkommend

Message:

#1788: added new online calculators.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• OnlineCalculators/OnlineMaxAbsoluteErrorCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAbsoluteErrorCalculator.cs) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -141 +141 @@
     <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" />
     <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" />
+    <Compile Include="OnlineCalculators\OnlineMaxAbsoluteErrorCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineMeanErrorCalculator.cs" />
     <Compile Include="OnlineCalculators\NormalizedGiniCalculator.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMaxAbsoluteErrorCalculator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class OnlineMeanAbsoluteErrorCalculator : IOnlineCalculator {
+  public class OnlineMaxAbsoluteErrorCalculator : IOnlineCalculator {
 
-    private double sae;
+    private double mae;
     private int n;
-    public double MeanAbsoluteError {
+    public double MaxAbsoluteError {
       get {
-        return n > 0 ? sae / n : 0.0;
+        return n > 0 ? mae : 0.0;
       }
     }
 
-    public OnlineMeanAbsoluteErrorCalculator() {
+    public OnlineMaxAbsoluteErrorCalculator() {
       Reset();
     }
@@ -44 +44 @@
     }
     public double Value {
-      get { return MeanAbsoluteError; }
+      get { return MaxAbsoluteError; }
     }
     public void Reset() {
       n = 0;
-      sae = 0.0;
+      mae = double.MinValue;
       errorState = OnlineCalculatorError.InsufficientElementsAdded;
     }
@@ -57 +57 @@
         errorState = errorState | OnlineCalculatorError.InvalidValueAdded;
       } else {
-        double error = estimated - original;
-        sae += Math.Abs(error);
+        double error = Math.Abs(estimated - original);
+        if (error > mae)
+          mae = error;
         n++;
         errorState = errorState & (~OnlineCalculatorError.InsufficientElementsAdded);        // n >= 1
@@ -68 +69 @@
       IEnumerator<double> originalEnumerator = originalValues.GetEnumerator();
       IEnumerator<double> estimatedEnumerator = estimatedValues.GetEnumerator();
-      OnlineMeanAbsoluteErrorCalculator maeCalculator = new OnlineMeanAbsoluteErrorCalculator();
+      OnlineMaxAbsoluteErrorCalculator maeCalculator = new OnlineMaxAbsoluteErrorCalculator();
 
       // always move forward both enumerators (do not use short-circuit evaluation!)
@@ -84 +85 @@
       } else {
         errorState = maeCalculator.ErrorState;
-        return maeCalculator.MeanAbsoluteError;
+        return maeCalculator.MaxAbsoluteError;
       }
     }