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

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

@@ -29 +29 @@
     private int n;
 
-    private OnlineEvaluatorError varianceErrorState;
-    public OnlineEvaluatorError VarianceErrorState {
+    private OnlineCalculatorError varianceErrorState;
+    public OnlineCalculatorError VarianceErrorState {
       get { return varianceErrorState; }
     }
@@ -40 +40 @@
     }
 
-    private OnlineEvaluatorError errorState;
-    public OnlineEvaluatorError PopulationVarianceErrorState {
+    private OnlineCalculatorError errorState;
+    public OnlineCalculatorError PopulationVarianceErrorState {
       get { return errorState; }
     }
@@ -50 +50 @@
     }
 
-    public OnlineEvaluatorError MeanErrorState {
+    public OnlineCalculatorError MeanErrorState {
       get { return errorState; }
     }
@@ -69 +69 @@
     public void Reset() {
       n = 0;
-      errorState = OnlineEvaluatorError.InsufficientElementsAdded;
-      varianceErrorState = OnlineEvaluatorError.InsufficientElementsAdded;
+      errorState = OnlineCalculatorError.InsufficientElementsAdded;
+      varianceErrorState = OnlineCalculatorError.InsufficientElementsAdded;
     }
 
     public void Add(double x) {
-      if (double.IsNaN(x) || double.IsInfinity(x) || (errorState & OnlineEvaluatorError.InvalidValueAdded) > 0) {
-        errorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
-        varianceErrorState = errorState | OnlineEvaluatorError.InvalidValueAdded;
+      if (double.IsNaN(x) || double.IsInfinity(x) || (errorState & OnlineCalculatorError.InvalidValueAdded) > 0) {
+        errorState = errorState | OnlineCalculatorError.InvalidValueAdded;
+        varianceErrorState = errorState | OnlineCalculatorError.InvalidValueAdded;
       } else {
         n++;
@@ -83 +83 @@
           m_oldM = m_newM = x;
           m_oldS = 0.0;
-          errorState = errorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 1
+          errorState = errorState & (~OnlineCalculatorError.InsufficientElementsAdded);        // n >= 1
         } else {
-          varianceErrorState = varianceErrorState & (~OnlineEvaluatorError.InsufficientElementsAdded);        // n >= 2
+          varianceErrorState = varianceErrorState & (~OnlineCalculatorError.InsufficientElementsAdded);        // n >= 2
           m_newM = m_oldM + (x - m_oldM) / n;
           m_newS = m_oldS + (x - m_oldM) * (x - m_newM);
@@ -96 +96 @@
     }
 
-    public static void Calculate(IEnumerable<double> x, out double mean, out double variance, out OnlineEvaluatorError meanErrorState, out OnlineEvaluatorError varianceErrorState) {
+    public static void Calculate(IEnumerable<double> x, out double mean, out double variance, out OnlineCalculatorError meanErrorState, out OnlineCalculatorError varianceErrorState) {
       OnlineMeanAndVarianceCalculator meanAndVarianceCalculator = new OnlineMeanAndVarianceCalculator();
       foreach (double xi in x) {