X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatistics.test.cc;h=2f78c62d22470243114b7f718aab614978e7436b;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=99c31e36ce663e0c5f189ac5cead487daac69c92;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Statistics.test.cc b/senf/Utils/Statistics.test.cc index 99c31e3..2f78c62 100644 --- a/senf/Utils/Statistics.test.cc +++ b/senf/Utils/Statistics.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -29,17 +29,20 @@ // Custom includes #include "Statistics.hh" #include "StatisticsTargets.hh" +#include +#include +#include #include "auto_unit_test.hh" #include #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { - - struct GetRange + + struct GetRank { typedef senf::Collector const & first_argument_type; typedef unsigned result_type; @@ -47,9 +50,61 @@ namespace { { return arg.rank(); } }; + struct splitFloats + { + typedef boost::char_separator Separator; + typedef boost::tokenizer Tokenizer; + struct Pred { + bool operator()(std::string const & s) const + { try { boost::lexical_cast(s); return true; } + catch (std::bad_cast &) { return false; } } + }; + typedef boost::filter_iterator FilterIterator; + struct Trafo { + typedef double result_type; + result_type operator()(std::string const & s) const + { return boost::lexical_cast(s); } + }; + typedef boost::transform_iterator TransformIterator; + + typedef TransformIterator iterator; + typedef TransformIterator const_iterator; + + splitFloats(std::string const & s) : s_ (s), sep_ (" \n"), tok_ (s_, sep_) {} + TransformIterator begin() const + { return TransformIterator(FilterIterator(tok_.begin(), tok_.end())); } + TransformIterator end() const + { return TransformIterator(FilterIterator(tok_.end(), tok_.end())); } + + std::string s_; + Separator sep_; + Tokenizer tok_; + }; + + template + void CHECK_CLOSE_RANGES(R1 const & r1, R2 const & r2, double delta) + { + typedef typename boost::range_const_iterator::type I1; + typedef typename boost::range_const_iterator::type I2; + + I1 i1 (boost::begin(r1)); + I1 i1_end (boost::end(r1)); + I2 i2 (boost::begin(r2)); + I2 i2_end (boost::end(r2)); + + for (; i1 != i1_end && i2 != i2_end; ++i1, ++i2) { + BOOST_CHECK_CLOSE(*i1, *i2, delta); + } + + BOOST_CHECK( i1 == i1_end ); + BOOST_CHECK( i2 == i2_end ); + } } -BOOST_AUTO_UNIT_TEST(statistics) +#define CHECK_STATS(a, b) CHECK_CLOSE_RANGES(splitFloats(a),splitFloats(b),0.001f) +#define CHECK_STATS_STR(a,b) BOOST_CHECK_EQUAL(a,b) + +SENF_AUTO_UNIT_TEST(statistics) { senf::Statistics stats; senf::log::StringTarget statslog; @@ -74,24 +129,24 @@ BOOST_AUTO_UNIT_TEST(statistics) senf::StatisticsLogger("level3")); unsigned children1[] = { 4u }; - BOOST_CHECK_EQUAL_COLLECTIONS( - boost::make_transform_iterator(stats.collectors().begin(), GetRange()), - boost::make_transform_iterator(stats.collectors().end(), GetRange()), + BOOST_CHECK_EQUAL_COLLECTIONS( + boost::make_transform_iterator(stats.collectors().begin(), GetRank()), + boost::make_transform_iterator(stats.collectors().end(), GetRank()), children1, children1 + sizeof(children1)/sizeof(children1[0]) ); unsigned children2[] = { 3u }; - BOOST_CHECK_EQUAL_COLLECTIONS( - boost::make_transform_iterator(stats[4].collectors().begin(), GetRange()), - boost::make_transform_iterator(stats[4].collectors().end(), GetRange()), + BOOST_CHECK_EQUAL_COLLECTIONS( + boost::make_transform_iterator(stats[4].collectors().begin(), GetRank()), + boost::make_transform_iterator(stats[4].collectors().end(), GetRank()), children2, children2 + sizeof(children2)/sizeof(children2[0]) ); unsigned children3[] = { 2u }; - BOOST_CHECK_EQUAL_COLLECTIONS( - boost::make_transform_iterator(stats[4][3].collectors().begin(), GetRange()), - boost::make_transform_iterator(stats[4][3].collectors().end(), GetRange()), + BOOST_CHECK_EQUAL_COLLECTIONS( + boost::make_transform_iterator(stats[4][3].collectors().begin(), GetRank()), + boost::make_transform_iterator(stats[4][3].collectors().end(), GetRank()), children3, children3 + sizeof(children3)/sizeof(children3[0]) ); - float values[][3] = { + float values[][3] = { { -1.0f, 2.3f, 2.5f }, { 0.3f, 2.4f, 3.8f }, { -1.1f, -0.3f, 0.0f }, { -0.3f, 3.2f, 3.3f }, { 1.0f, 1.1f, 1.1f }, { 0.5f, 0.5f, 0.5f }, { 0.0f, 0.0f, 0.0f }, { -2.0f, -1.8f, -1.0f }, { 0.0f, 2.3f, 2.4f }, @@ -102,71 +157,125 @@ BOOST_AUTO_UNIT_TEST(statistics) { 0.3f, 2.4f, 3.8f }, { -1.1f, -0.3f, 0.0f }, { -0.3f, 3.2f, 3.3f }, { 1.0f, 1.1f, 1.1f }, { 0.5f, 0.5f, 0.5f }, { 0.0f, 0.0f, 0.0f }, { -2.0f, -1.8f, -1.0f }, { 0.0f, 2.3f, 2.4f }, { 0.4f, 1.2f, 4.0f } }; + // 30 entries + // -> 30 calls of stats() + // (rest 2) + // -> 7 calls of stats[4]() + // (rest 1) + // -> 2 calls of stats[4][3]() + // (rest 0) + // -> 1 call of stats[4][3][2] for (unsigned i (0); i < sizeof(values)/sizeof(values[0]); ++i) stats(values[i][0], values[i][1], values[i][2]); - BOOST_CHECK_CLOSE( stats.min(), 0.4f, .1f ); - BOOST_CHECK_CLOSE( stats.avg(), 1.2f, .1f ); - BOOST_CHECK_CLOSE( stats.max(), 4.0f, .1f ); - - BOOST_CHECK_CLOSE( stats[4].min(), -2.0f, .1f ); - BOOST_CHECK_CLOSE( stats[4].avg(), -0.05f, .1f ); - BOOST_CHECK_CLOSE( stats[4].max(), 1.1f, .1f ); - - BOOST_CHECK_CLOSE( stats[4][3].min(), -2.0f, .1f ); - BOOST_CHECK_CLOSE( stats[4][3].avg(), 1.15f, .1f ); - BOOST_CHECK_CLOSE( stats[4][3].max(), 3.8f, .1f ); - - BOOST_CHECK_EQUAL( statslog.str(), - "level0 -1 2.3 2.5\n" - "level0 -0.35 2.35 3.15\n" - "level0 -0.4 1.05 1.9\n" - "level0 -0.7 1.45 1.65\n" - "level1 -1.1 1.9 3.8\n" - "averaged1 -1.1 1.9 3.8\n" - "level0 0.35 2.15 2.2\n" - "level0 0.75 0.8 0.8\n" - "level0 0.25 0.25 0.25\n" - "level0 -1 -0.9 -0.5\n" - "level1 -2 -0.05 1.1\n" - "averaged1 -1.55 0.925 2.45\n" - "level0 -1 0.25 0.7\n" - "level0 0.2 1.75 2.2\n" - "level0 -0.3 1.75 2.25\n" - "level0 -0.35 2.35 3.15\n" - "level1 -1 2.05 3.8\n" - "averaged1 -1.36667 1.3 2.9\n" - "level0 -0.4 1.05 1.9\n" - "level0 -0.7 1.45 1.65\n" - "level0 0.35 2.15 2.2\n" - "level0 0.75 0.8 0.8\n" - "level1 -1.1 1.125 3.3\n" - "averaged1 -1.36667 1.04167 2.73333\n" - "level0 0.25 0.25 0.25\n" - "level0 -1 -0.9 -0.5\n" - "level0 -1 0.25 0.7\n" - "level0 0.2 1.75 2.2\n" - "level1 -2 0.425 2.4\n" - "averaged1 -1.36667 1.2 3.16667\n" - "level0 -0.3 1.75 2.25\n" - "level0 -0.35 2.35 3.15\n" - "level0 -0.4 1.05 1.9\n" - "level0 -0.7 1.45 1.65\n" - "level1 -1.1 1.9 3.8\n" - "averaged1 -1.4 1.15 3.16667\n" - "level3 -2 1.225 3.8\n" - "level0 0.35 2.15 2.2\n" - "level0 0.75 0.8 0.8\n" - "level0 0.25 0.25 0.25\n" - "level0 -1 -0.9 -0.5\n" - "level1 -2 -0.05 1.1\n" - "averaged1 -1.7 0.758333 2.43333\n" - "level0 -1 0.25 0.7\n" - "level0 0.2 1.75 3.2\n" ); + BOOST_CHECK_CLOSE( stats.min(), 0.4f, .001f ); + BOOST_CHECK_CLOSE( stats.avg(), 1.2f, .001f ); + BOOST_CHECK_CLOSE( stats.max(), 4.0f, .001f ); + BOOST_CHECK_CLOSE( stats.dev(), 0.0f, .001f ); + + BOOST_CHECK_CLOSE( stats[4].min(), -2.0f, .001f ); + BOOST_CHECK_CLOSE( stats[4].avg(), -0.05f, .001f ); + BOOST_CHECK_CLOSE( stats[4].max(), 1.1f, .001f ); + BOOST_CHECK_CLOSE( stats[4].dev(), 1.08282f, .001f ); + + BOOST_CHECK_CLOSE( stats[4][3].min(), -2.0f, .001f ); + BOOST_CHECK_CLOSE( stats[4][3].avg(), 1.15f, .001f ); + BOOST_CHECK_CLOSE( stats[4][3].max(), 3.8f, .001f ); + + CHECK_STATS( statslog.str(), + "level0 -1 2.3 2.5 0\n" + "level0 -0.35 2.35 3.15 0\n" + "level0 -0.4 1.05 1.9 0\n" + "level0 -0.7 1.45 1.65 0\n" + "level1 -1.1 1.9 3.8 1.31719\n" + "averaged1 -1.1 1.9 3.8 1.31719\n" + "level0 0.35 2.15 2.2 0\n" + "level0 0.75 0.8 0.8 0\n" + "level0 0.25 0.25 0.25 0\n" + "level0 -1 -0.9 -0.5 0\n" + "level1 -2 -0.05 1.1 1.08282\n" + "averaged1 -1.55 0.925 2.45 1.20001\n" + "level0 -1 0.25 0.7 0\n" + "level0 0.2 1.75 2.2 0\n" + "level0 -0.3 1.75 2.25 0\n" + "level0 -0.35 2.35 3.15 0\n" + "level1 -1 2.05 3.8 0.492442\n" + "averaged1 -1.36667 1.3 2.9 0.964152\n" + "level0 -0.4 1.05 1.9 0\n" + "level0 -0.7 1.45 1.65 0\n" + "level0 0.35 2.15 2.2 0\n" + "level0 0.75 0.8 0.8 0\n" + "level1 -1.1 1.125 3.3 1.29687\n" + "averaged1 -1.36667 1.04167 2.73333 0.957378\n" + "level0 0.25 0.25 0.25 0\n" + "level0 -1 -0.9 -0.5 0\n" + "level0 -1 0.25 0.7 0\n" + "level0 0.2 1.75 2.2 0\n" + "level1 -2 0.425 2.4 1.52049\n" + "averaged1 -1.36667 1.2 3.16667 1.10327\n" + "level0 -0.3 1.75 2.25 0\n" + "level0 -0.35 2.35 3.15 0\n" + "level0 -0.4 1.05 1.9 0\n" + "level0 -0.7 1.45 1.65 0\n" + "level1 -1.1 1.9 3.8 1.31719\n" + "averaged1 -1.4 1.15 3.16667 1.37818\n" + "level3 -2 1.225 3.8 1.45752\n" + "level0 0.35 2.15 2.2 0\n" + "level0 0.75 0.8 0.8 0\n" + "level0 0.25 0.25 0.25 0\n" + "level0 -1 -0.9 -0.5 0\n" + "level1 -2 -0.05 1.1 1.08282\n" + "averaged1 -1.7 0.758333 2.43333 1.30683\n" + "level0 -1 0.25 0.7 0\n" + "level0 0.2 1.75 3.2 0\n" ); + + statslog.clear(); + stats(20, 10.f, 10.f, 10.f, 0.f); + stats(4, 0.f, 0.f, 0.f, 0.f); + + CHECK_STATS( statslog.str(), + "level0 5.2 5.6 7 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level0 10 10 10 0\n" + "level1 0 5.875 10 8.19554\n" + "averaged1 -1.03333 2.575 4.96667 3.53185\n" + "level1 10 10 10 0\n" + "averaged1 2.66667 5.275 7.03333 3.09279\n" + "level1 10 10 10 0\n" + "averaged1 6.66667 8.625 10 2.73185\n" + "level1 10 10 10 0\n" + "averaged1 10 10 10 0\n" + "level1 10 10 10 0\n" + "averaged1 10 10 10 0\n" + "level3 -2 7.6375 10 5.04759\n" + "level0 5 5 5 0\n" + "level0 0 0 0 0\n" + "level0 0 0 0 0\n" + "level0 0 0 0 0\n" + "level1 0 5 10 8.66025\n" + "averaged1 6.66667 8.33333 10 2.88675\n" ); + } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_