Replace NULL with nullptr.

[loba.git] / statistics.h

diff --git a/statistics.h b/statistics.h
index 7e3fb2ead86d5b70f48430a6d662710c3b44bd9c..78f93e367da93b8e52d2578ca1277b565026d155 100644 (file)
--- a/statistics.h
+++ b/statistics.h
@@ -2,12 +2,14 @@
 #define STATISTICS_H
 
 #include <cmath>
 #define STATISTICS_H
 
 #include <cmath>

-#include <vector>
+#include <limits>

 
 class statistics {
 public:
     statistics()
         : count(0)
 
 class statistics {
 public:
     statistics()
         : count(0)

+        , min(std::numeric_limits<double>::infinity())
+        , max(-std::numeric_limits<double>::infinity())

         , sum(0.0)
         , mean(0.0)
         , sqdiff_sum(0.0)
         , sum(0.0)
         , mean(0.0)
         , sqdiff_sum(0.0)


@@ -16,19 +18,27 @@ public:
     void push(double x) {
         double delta = x - mean;
         ++count;
     void push(double x) {
         double delta = x - mean;
         ++count;

+        if (x < min)
+            min = x;
+        if (x > max)
+            max = x;

         sum += x;
         mean = sum / count;
         sqdiff_sum += delta * (x - mean);
     }
 
         sum += x;
         mean = sum / count;
         sqdiff_sum += delta * (x - mean);
     }
 

-    unsigned get_count() const  { return count;                }
-    double get_sum() const      { return sum;                  }
-    double get_mean() const     { return mean;                 }
-    double get_variance() const { return sqdiff_sum / count;   }
-    double get_stddev() const   { return sqrt(get_variance()); }
+    unsigned get_count() const  { return count;                     }
+    double get_min() const      { return min;                       }
+    double get_max() const      { return max;                       }
+    double get_sum() const      { return sum;                       }
+    double get_mean() const     { return mean;                      }
+    double get_variance() const { return sqdiff_sum / count;        }
+    double get_stddev() const   { return std::sqrt(get_variance()); }

 
 private:
     int count;
 
 private:
     int count;

+    double min;                 // min of x_i
+    double max;                 // max of x_i

     double sum;                 // sum of x_i
     double mean;                // mean of x_i
     double sqdiff_sum;          // sum of (x_i - mean)^2
     double sum;                 // sum of x_i
     double mean;                // mean of x_i
     double sqdiff_sum;          // sum of (x_i - mean)^2