Changeset 14012 for stable

Timestamp:

07/07/16 10:22:42 (8 years ago)

Author:

mkommend

Message:

#2628: Merged r14011 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/EnumerableStatisticExtensions.cs (modified) (3 diffs)

stable/HeuristicLab.Common/3.3/EnumerableStatisticExtensions.cs

@@ -164 +164 @@
 
     /// <summary>
-    /// Calculates the standard deviation of values.
+    /// Calculates the sample standard deviation of values.
     /// </summary>
     /// <param name="values"></param>
@@ -173 +173 @@
 
     /// <summary>
-    /// Calculates the variance of values. (sum (x - x_mean)² / n)
+    /// Calculates the population standard deviation of values.
+    /// </summary>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static double StandardDeviationPop(this IEnumerable<double> values) {
+      return Math.Sqrt(VariancePop(values));
+    }
+
+    /// <summary>
+    /// Calculates the sample variance of values. (sum (x - x_mean)² / (n-1))
     /// </summary>
     /// <param name="values"></param>
     /// <returns></returns>
     public static double Variance(this IEnumerable<double> values) {
+      return Variance(values, true);
+    }
+
+    /// <summary>
+    /// Calculates the population variance of values. (sum (x - x_mean)² / n)
+    /// </summary>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static double VariancePop(this IEnumerable<double> values) {
+      return Variance(values, false);
+    }
+
+    private static double Variance(IEnumerable<double> values, bool sampleVariance) {
       int m_n = 0;
       double m_oldM = 0.0;
@@ -197 +219 @@
         }
       }
-      return ((m_n > 1) ? m_newS / (m_n - 1) : 0.0);
+
+      if (m_n == 0) return double.NaN;
+      if (m_n == 1) return 0.0;
+
+      if (sampleVariance) return m_newS / (m_n - 1);
+      else return m_newS / m_n;
     }