Code reformat
diff --git a/src/stat.h b/src/stat.h
index c36cf05..1a726d2 100644
--- a/src/stat.h
+++ b/src/stat.h
@@ -12,27 +12,24 @@
template <typename VType, typename NumType>
class Stat1MinMax;
-typedef Stat1<float, float> Stat1_f;
+typedef Stat1<float, float> Stat1_f;
typedef Stat1<double, double> Stat1_d;
-typedef Stat1MinMax<float, float> Stat1MinMax_f;
+typedef Stat1MinMax<float, float> Stat1MinMax_f;
typedef Stat1MinMax<double, double> Stat1MinMax_d;
-template <typename VType> class Vector2;
-template <typename VType> class Vector3;
-template <typename VType> class Vector4;
+template <typename VType>
+class Vector2;
+template <typename VType>
+class Vector3;
+template <typename VType>
+class Vector4;
template <typename VType, typename NumType>
class Stat1 {
public:
typedef Stat1<VType, NumType> Self;
- Stat1() {
- Clear();
- }
- void Clear() {
- numsamples_ = NumType();
- sum_squares_ = sum_ = VType();
- }
+ Stat1() { Clear(); }
// Create a sample of value dat and weight 1
explicit Stat1(const VType &dat) {
sum_ = dat;
@@ -43,7 +40,7 @@
// and end(excluded)
explicit Stat1(const VType *begin, const VType *end) {
Clear();
- for ( const VType *item = begin; item < end; ++item ) {
+ for (const VType *item = begin; item < end; ++item) {
(*this) += Stat1(*item);
}
}
@@ -60,58 +57,60 @@
numsamples_ = stat.numsamples_;
}
- inline Self &operator =(const Self &stat) {
+ void Clear() {
+ numsamples_ = NumType();
+ sum_squares_ = sum_ = VType();
+ }
+
+ Self& operator=(const Self &stat) {
sum_ = stat.sum_;
sum_squares_ = stat.sum_squares_;
numsamples_ = stat.numsamples_;
return (*this);
}
// Merge statistics from two sample sets.
- inline Self &operator +=(const Self &stat) {
+ Self& operator+=(const Self &stat) {
sum_ += stat.sum_;
- sum_squares_+= stat.sum_squares_;
+ sum_squares_ += stat.sum_squares_;
numsamples_ += stat.numsamples_;
return (*this);
}
// The operation opposite to +=
- inline Self &operator -=(const Self &stat) {
+ Self& operator-=(const Self &stat) {
sum_ -= stat.sum_;
- sum_squares_-= stat.sum_squares_;
+ sum_squares_ -= stat.sum_squares_;
numsamples_ -= stat.numsamples_;
return (*this);
}
// Multiply the weight of the set of samples by a factor k
- inline Self &operator *=(const VType &k) {
+ Self& operator*=(const VType &k) {
sum_ *= k;
- sum_squares_*= k;
+ sum_squares_ *= k;
numsamples_ *= k;
return (*this);
}
+
// Merge statistics from two sample sets.
- inline Self operator + (const Self &stat) const {
- return Self(*this) += stat;
- }
+ Self operator+(const Self& stat) const { return Self(*this) += stat; }
+
// The operation opposite to +
- inline Self operator - (const Self &stat) const {
- return Self(*this) -= stat;
- }
+ Self operator-(const Self& stat) const { return Self(*this) -= stat; }
+
// Multiply the weight of the set of samples by a factor k
- inline Self operator * (const VType &k) const {
- return Self(*this) *= k;
- }
+ Self operator*(const VType& k) const { return Self(*this) *= k; }
+
// Return the total weight of this sample set
- NumType NumSamples() const {
- return numsamples_;
- }
+ NumType numSamples() const { return numsamples_; }
+
// Return the sum of this sample set
- VType Sum() const {
- return sum_;
- }
+ VType sum() const { return sum_; }
+
// Return the mean of this sample set
VType Mean() const {
if (numsamples_ == 0) return VType();
return sum_ * (1.0 / numsamples_);
}
+
// Return the mean of this sample set and compute the standard deviation at
// the same time.
VType Mean(VType *stddev) const {
@@ -119,10 +118,11 @@
VType mean = sum_ * (1.0 / numsamples_);
if (stddev) {
VType avg_squares = sum_squares_ * (1.0 / numsamples_);
- *stddev = Sqrt(avg_squares - Sqr(mean));
+ *stddev = Sqrt(avg_squares - Sqr(mean));
}
return mean;
}
+
// Return the standard deviation of the sample set
VType StdDev() const {
if (numsamples_ == 0) return VType();
@@ -130,10 +130,11 @@
VType avg_squares = sum_squares_ * (1.0 / numsamples_);
return Sqrt(avg_squares - Sqr(mean));
}
+
private:
- // Let i be the index of the samples provided (using +=)
- // and weight[i],value[i] be the data of sample #i
- // then the variables have the following meaning:
+ // Let i be the index of the samples provided (using +=)
+ // and weight[i],value[i] be the data of sample #i
+ // then the variables have the following meaning:
NumType numsamples_; // sum of weight[i];
VType sum_; // sum of weight[i]*value[i];
VType sum_squares_; // sum of weight[i]*value[i]^2;
@@ -141,17 +142,18 @@
// Template function used to square a number.
// For a vector we square all components
template <typename SType>
- static inline SType Sqr(const SType &dat) {
- return dat * dat;
- }
+ static inline SType Sqr(const SType &dat) { return dat * dat; }
+
template <typename SType>
static inline Vector2<SType> Sqr(const Vector2<SType> &dat) {
return dat.MulComponents(dat);
}
+
template <typename SType>
static inline Vector3<SType> Sqr(const Vector3<SType> &dat) {
return dat.MulComponents(dat);
}
+
template <typename SType>
static inline Vector4<SType> Sqr(const Vector4<SType> &dat) {
return dat.MulComponents(dat);
@@ -162,20 +164,22 @@
template <typename SType>
static inline SType Sqrt(const SType &dat) {
// Avoid NaN due to imprecision in the calculations
- if ( dat < 0 )
- return 0;
+ if (dat < 0) return 0;
return sqrt(dat);
}
+
template <typename SType>
static inline Vector2<SType> Sqrt(const Vector2<SType> &dat) {
// Avoid NaN due to imprecision in the calculations
return Max(dat, Vector2<SType>()).Sqrt();
}
+
template <typename SType>
static inline Vector3<SType> Sqrt(const Vector3<SType> &dat) {
// Avoid NaN due to imprecision in the calculations
return Max(dat, Vector3<SType>()).Sqrt();
}
+
template <typename SType>
static inline Vector4<SType> Sqrt(const Vector4<SType> &dat) {
// Avoid NaN due to imprecision in the calculations
@@ -185,15 +189,12 @@
// Useful printing function
template <typename VType, typename NumType>
-inline std::ostream& operator<<(std::ostream& out,
- const Stat1<VType, NumType>& s) {
- out << "{ avg = " << s.Mean()
- << " std = " << s.StdDev()
+std::ostream& operator<<(std::ostream& out, const Stat1<VType, NumType>& s) {
+ out << "{ avg = " << s.Mean() << " std = " << s.StdDev()
<< " nsamples = " << s.NumSamples() << "}";
return out;
}
-
// Stat1MinMax: same as Stat1, but it also
// keeps the Min and Max values; the "-"
// operator is disabled because it cannot be implemented
@@ -203,9 +204,32 @@
public:
typedef Stat1MinMax<VType, NumType> Self;
- Stat1MinMax() {
- Clear();
+ Stat1MinMax() { Clear(); }
+ // Create a sample of value dat and weight 1
+ explicit Stat1MinMax(const VType &dat) : Stat1<VType, NumType>(dat) {
+ max_ = dat;
+ min_ = dat;
}
+ // Create statistics for all the samples between begin (included)
+ // and end(excluded)
+ explicit Stat1MinMax(const VType *begin, const VType *end) {
+ Clear();
+ for (const VType* item = begin; item < end; ++item) {
+ (*this) += Stat1MinMax(*item);
+ }
+ }
+ // Create a sample of value dat and weight w
+ Stat1MinMax(const VType &dat, const NumType &w)
+ : Stat1<VType, NumType>(dat, w) {
+ max_ = dat;
+ min_ = dat;
+ }
+ // Copy operator
+ Stat1MinMax(const Self &stat) : Stat1<VType, NumType>(stat) {
+ max_ = stat.max_;
+ min_ = stat.min_;
+ }
+
void Clear() {
Stat1<VType, NumType>::Clear();
if (std::numeric_limits<VType>::has_infinity) {
@@ -216,90 +240,57 @@
max_ = std::numeric_limits<VType>::min();
}
}
- // Create a sample of value dat and weight 1
- explicit Stat1MinMax(const VType &dat) : Stat1<VType, NumType>(dat) {
- max_ = dat;
- min_ = dat;
- }
- // Create statistics for all the samples between begin (included)
- // and end(excluded)
- explicit Stat1MinMax(const VType *begin, const VType *end) {
- Clear();
- for ( const VType *item = begin; item < end; ++item ) {
- (*this) += Stat1MinMax(*item);
- }
- }
- // Create a sample of value dat and weight w
- Stat1MinMax(const VType &dat, const NumType &w)
- : Stat1<VType, NumType>(dat, w) {
- max_ = dat;
- min_ = dat;
- }
- // Copy operator
- Stat1MinMax(const Self &stat) : Stat1<VType, NumType>(stat) {
- max_ = stat.max_;
- min_ = stat.min_;
- }
- inline Self &operator =(const Self &stat) {
+
+ Self& operator=(const Self& stat) {
this->Stat1<VType, NumType>::operator=(stat);
max_ = stat.max_;
min_ = stat.min_;
return (*this);
}
// Merge statistics from two sample sets.
- inline Self &operator +=(const Self &stat) {
+ Self& operator+=(const Self& stat) {
this->Stat1<VType, NumType>::operator+=(stat);
if (stat.max_ > max_) max_ = stat.max_;
if (stat.min_ < min_) min_ = stat.min_;
return (*this);
}
// Multiply the weight of the set of samples by a factor k
- inline Self &operator *=(const VType &stat) {
+ Self& operator*=(const VType& stat) {
this->Stat1<VType, NumType>::operator*=(stat);
return (*this);
}
// Merge statistics from two sample sets.
- inline Self operator + (const Self &stat) const {
- return Self(*this) += stat;
- }
+ Self operator+(const Self& stat) const { return Self(*this) += stat; }
// Multiply the weight of the set of samples by a factor k
- inline Self operator * (const VType &k) const {
- return Self(*this) *= k;
- }
+ Self operator*(const VType& k) const { return Self(*this) *= k; }
+
+ // Return the maximal value in this sample set
+ VType max() const { return max_; }
+ // Return the minimal value in this sample set
+ VType min() const { return min_; }
+
private:
// The - operation makes no sense with Min/Max
// unless we keep the full list of values (but we don't)
// make it private, and let it undefined so nobody can call it
- Self &operator -=(const Self &stat); // senseless. let it undefined.
+ Self &operator-=(const Self& stat); // senseless. let it undefined.
// The operation opposite to -
- Self operator - (const Self &stat) const; // senseless. let it undefined.
+ Self operator-(const Self& stat) const; // senseless. let it undefined.
- public:
- // Return the maximal value in this sample set
- VType Max() const {
- return max_;
- }
- // Return the minimal value in this sample set
- VType Min() const {
- return min_;
- }
- private:
- // Let i be the index of the samples provided (using +=)
- // and weight[i],value[i] be the data of sample #i
- // then the variables have the following meaning:
- VType max_; // max of value[i]
- VType min_; // min of value[i]
+ // Let i be the index of the samples provided (using +=)
+ // and weight[i],value[i] be the data of sample #i
+ // then the variables have the following meaning:
+ VType max_; // max of value[i]
+ VType min_; // min of value[i]
};
// Useful printing function
template <typename VType, typename NumType>
-inline std::ostream& operator <<(std::ostream& out,
- const Stat1MinMax<VType, NumType>& s) {
- out << "{ avg = " << s.Mean()
- << " std = " << s.StdDev()
- << " nsamples = " << s.NumSamples()
- << " min = " << s.Min()
+std::ostream& operator<<(std::ostream& out,
+ const Stat1MinMax<VType, NumType>& s) {
+ out << "{ avg = " << s.Mean() << " std = " << s.StdDev()
+ << " nsamples = " << s.NumSamples() << " min = " << s.Min()
<< " max = " << s.Max() << "}";
return out;
}
