X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatisticAccumulator.hh;h=ae35600d2f641fd2915eccc87641facb048487e3;hb=HEAD;hp=ab7697972fcc22c03154e488a56e384d9e387ad5;hpb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;p=senf.git diff --git a/senf/Utils/StatisticAccumulator.hh b/senf/Utils/StatisticAccumulator.hh index ab76979..ae35600 100644 --- a/senf/Utils/StatisticAccumulator.hh +++ b/senf/Utils/StatisticAccumulator.hh @@ -23,7 +23,9 @@ // All Rights Reserved. // // Contributor(s): -// Thorsten Horstmann +// Mathias Kretschmer +// Jens Moedeker + /** \file \brief StatisticAccumulator public header */ @@ -33,20 +35,18 @@ // Custom includes #include #include +#include ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { struct StatisticsData { - StatisticsData( float min_, float avg_, float max_, float stddev_, boost::uint32_t count_) - : min(min_), avg(avg_), max(max_), stddev(stddev_), count(count_){ - }; - StatisticsData( StatisticsData const & other) - : min(other.min), avg(other.avg), max(other.max), stddev(other.stddev), count(other.count){ - }; - StatisticsData() - : min(0.0), avg(0.0), max(0.0), stddev(0.0), count(0){ - }; + StatisticsData(float min_, float avg_, float max_, float stddev_, boost::uint32_t count_) + : min(min_), avg(avg_), max(max_), stddev(stddev_), count(count_) {}; + StatisticsData(StatisticsData const & other) + : min(other.min), avg(other.avg), max(other.max), stddev(other.stddev), count(other.count) {}; + StatisticsData() + : min(0.0), avg(0.0), max(0.0), stddev(0.0), count(0) {}; float min; float avg; @@ -55,6 +55,8 @@ namespace senf { boost::uint32_t count; }; + std::ostream & operator<<(std::ostream & os, StatisticsData const & _data); + /** \brief Accumulate measurement values The accumulator mainly do the prelimenary work for the senf::Statistic class. @@ -74,43 +76,39 @@ namespace senf { { public: StatisticAccumulator(); -// virtual ~StatisticAccumulator(); - - void clear(); - ///< Reset accumulated values. - /**< This member reset all values. */ - void accumulate(T value); - ///< Gather value to be accumulated. - /**< This method accumulates a value. - \param[in] value to be accumulated value*/ - void setLastAvg(T value); - ///< If no real data was collected, this method specifies the min/avg/max value to be returned. - /**< This method specifies the the min/avg/max value to be returned if no real data was colelcted - \param[in] value to be returned*/ - - public: - T min() const; - ///< Returns current minimal value. - /**< This method returns the minimal value of the current accumulation.*/ - T max() const; - ///< Returns current maximal value. - /**< This method returns the maximal value of the current accumulation.*/ - float avg() const; - ///< Returns average value. - /**< This method returns the average value of the current accumulation.*/ - float last_avg() const; - ///< Returns former average value. - /**< This method returns the average value of the former accumulation period.*/ - float stddev() const; - ///< Returns standard deviation value. - /**< This method returns the standard deviation value of the current accumulation.*/ - boost::uint32_t count() const; - ///< Returns count of accumulated values. - /**< This method returns count of accumulated values of the current accumulation.*/ - void data( StatisticsData & data_) const; - ///< Returns the accumulated data as a tuple - /**< This method returns the accumulated information as a tuple.*/ + void clear(); ///< Reset accumulated values. + /**< This member reset all values. */ + void accumulate(T value); ///< Gather value to be accumulated. + /**< This method accumulates a value. + \param[in] value to be accumulated value */ + void setLastAvg(T value); ///< If no real data was collected, this method specifies the min/avg/max value to be returned. + /**< This method specifies the the min/avg/max value to + be returned if no real data was collected + \param[in] value to be returned */ + + T min() const; ///< Returns current minimal value. + /**< This method returns the minimal value of the + current accumulation. */ + T max() const; ///< Returns current maximal value. + /**< This method returns the maximal value of the + current accumulation.*/ + float avg() const; ///< Returns average value. + /**< This method returns the average value of the + current accumulation.*/ + float last_avg() const; ///< Returns former average value. + /**< This method returns the average value of the + former accumulation period.*/ + float stddev() const; ///< Returns standard deviation value. + /**< This method returns the standard deviation + value of the current accumulation.*/ + boost::uint32_t count() const; ///< Returns count of accumulated values. + /**< This method returns count of accumulated + values of the current accumulation.*/ + void data(StatisticsData & data_) const; + ///< Returns the accumulated data as a tuple + /**< This method returns the accumulated information + as a tuple.*/ private: T sum_squared_; T sum_; @@ -118,14 +116,8 @@ namespace senf { T max_; float last_avg_; boost::uint32_t count_; - - }; - - typedef StatisticAccumulator StatisticAccumulatorInt; - typedef StatisticAccumulator StatisticAccumulatorFloat; - } ///////////////////////////////hh.e//////////////////////////////////////// //#include "StatisticAccumulator.cci"