Changeset 5942 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorCalculator.cs

Timestamp:

04/04/11 15:38:16 (13 years ago)

Author:

mkommend

Message:

#1453: Renamed IOnlineEvaluator to IOnlineCalculator

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorEvaluator.cs) (7 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineMeanAbsolutePercentageErrorCalculator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class OnlineMeanAbsolutePercentageErrorEvaluator : IOnlineEvaluator {
+  public class OnlineMeanAbsolutePercentageErrorCalculator : IOnlineCalculator {
 
     private double sre;
@@ -35 +35 @@
     }
 
-    public OnlineMeanAbsolutePercentageErrorEvaluator() {
+    public OnlineMeanAbsolutePercentageErrorCalculator() {
       Reset();
     }
 
-    #region IOnlineEvaluator Members
-    private OnlineEvaluatorError errorState;
-    public OnlineEvaluatorError ErrorState {
+    #region IOnlineCalculator Members
+    private OnlineCalculatorError errorState;
+    public OnlineCalculatorError ErrorState {
       get { return errorState; }
     }
@@ -50 +50 @@
       n = 0;
       sre = 0.0;
-      errorState = OnlineEvaluatorError.InsufficientElementsAdded;
+      errorState = OnlineCalculatorError.InsufficientElementsAdded;
     }
 
@@ -57 +57 @@
           double.IsNaN(original) || double.IsInfinity(original) ||
         original.IsAlmost(0.0)) {
-        errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
+        errorState = errorState | OnlineCalculatorError.InvalidValueAdded;
       } else {
         sre += Math.Abs((estimated - original) / original);
         n++;
-        errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
+        errorState = errorState & (~OnlineCalculatorError.InsufficientElementsAdded);        // n >= 1
       }
     }
@@ -67 +67 @@
     #endregion
 
-    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineEvaluatorError errorState) {
+    public static double Calculate(IEnumerable<double> first, IEnumerable<double> second, out OnlineCalculatorError errorState) {
       IEnumerator<double> firstEnumerator = first.GetEnumerator();
       IEnumerator<double> secondEnumerator = second.GetEnumerator();
-      OnlineMeanAbsolutePercentageErrorEvaluator evaluator = new OnlineMeanAbsolutePercentageErrorEvaluator();
+      OnlineMeanAbsolutePercentageErrorCalculator calculator = new OnlineMeanAbsolutePercentageErrorCalculator();
 
       // always move forward both enumerators (do not use short-circuit evaluation!)
@@ -76 +76 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        evaluator.Add(original, estimated);
+        calculator.Add(original, estimated);
       }
 
@@ -83 +83 @@
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {
-        errorState = evaluator.ErrorState;
-        return evaluator.MeanAbsolutePercentageError;
+        errorState = calculator.ErrorState;
+        return calculator.MeanAbsolutePercentageError;
       }
     }