Changeset 5942 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineAccuracyCalculator.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/OnlineAccuracyCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineEvaluators/OnlineAccuracyEvaluator.cs) (6 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class OnlineAccuracyEvaluator : IOnlineEvaluator {
+  public class OnlineAccuracyCalculator : IOnlineCalculator {
 
     private int correctlyClassified;
@@ -35 +35 @@
     }
 
-    public OnlineAccuracyEvaluator() {
+    public OnlineAccuracyCalculator() {
       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;
       correctlyClassified = 0;
-      errorState = OnlineEvaluatorError.InsufficientElementsAdded;
+      errorState = OnlineCalculatorError.InsufficientElementsAdded;
     }
 
@@ -63 +63 @@
           correctlyClassified++;
         }
-        errorState = OnlineEvaluatorError.None; // number of (non-NaN) samples >= 1
+        errorState = OnlineCalculatorError.None; // number of (non-NaN) samples >= 1
       }
     }
     #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();
-      OnlineAccuracyEvaluator accuracyEvaluator = new OnlineAccuracyEvaluator();
+      OnlineAccuracyCalculator accuracyCalculator = new OnlineAccuracyCalculator();
 
       // always move forward both enumerators (do not use short-circuit evaluation!)
@@ -77 +77 @@
         double estimated = secondEnumerator.Current;
         double original = firstEnumerator.Current;
-        accuracyEvaluator.Add(original, estimated);
+        accuracyCalculator.Add(original, estimated);
       }
 
@@ -84 +84 @@
         throw new ArgumentException("Number of elements in first and second enumeration doesn't match.");
       } else {
-        errorState = accuracyEvaluator.ErrorState;
-        return accuracyEvaluator.Accuracy;
+        errorState = accuracyCalculator.ErrorState;
+        return accuracyCalculator.Accuracy;
       }
     }