X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatistics.test.cc;fp=senf%2FUtils%2FStatistics.test.cc;h=638783b74e0fc94216c0450f5a7e3a32b162bf38;hb=69be773e2fe0ea5d60cb4a763bfffa673cfc417f;hp=99c31e36ce663e0c5f189ac5cead487daac69c92;hpb=7f1e38e4538c40325566e9fe3f12bf10c3ed3b93;p=senf.git

diff --git a/senf/Utils/Statistics.test.cc b/senf/Utils/Statistics.test.cc
index 99c31e3..638783b 100644
--- a/senf/Utils/Statistics.test.cc
+++ b/senf/Utils/Statistics.test.cc
@@ -109,61 +109,64 @@ BOOST_AUTO_UNIT_TEST(statistics)
     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.dev(), 0.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].dev(), 1.08282f, .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" );
+                       "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" );
+
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////