removed spurious '%'

[senf.git] / senf / Utils / Statistics.cc

diff --git a/senf/Utils/Statistics.cc b/senf/Utils/Statistics.cc
index a96b33b..cc13424 100644 (file)
--- a/senf/Utils/Statistics.cc
+++ b/senf/Utils/Statistics.cc
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <sstream>
-#include "Console/Console.hh"
+#include <senf/Utils/Console/Console.hh>
 #include "StatisticsTargets.hh"
 
 //#include "Statistics.mpp"
@@ -81,28 +81,33 @@ senf::StatisticsBase::output(unsigned n)
 }
 
 //
-// generate an engineering style notation i
+// generate an engineering style notation 
 //
-char *format_eng( float f)
+std::string format_eng( float f)
 {
-    static char buf[16];
-    if( f > 0){
+    char buf[16];
+    if (f > 0) {
         int n = 0;
-        while( f >= 1000.0f){
-                f /= 1000.f;
+        while( f >= 1000.0f) {
+                f /= 1000.0f;
                 n+=3;
         }
 
-        sprintf( buf, " %3.2fe%+03d", f, n);
+        if( n >=3)
+            sprintf( buf, " %3.2fe%+03d", f, n);
+        else
+            sprintf( buf, "      %3.2f", f);
     }
-    else if( f < 0){
+    else if (f < 0) {
         int n = 0;
-        while( f <= -1000.0f){
-                f *= 1000.f;
+        while( f <= -1000.0f) {
+                f *= 1000.0f;
                 n+=3;
         }
-
-        sprintf( buf, "%3.2fe%+03d", f, n);
+        if( n >=3)
+            sprintf( buf, " %3.2fe%+03d", f, n);
+        else
+            sprintf( buf, "      %3.2f", f);
     }
     else{
         sprintf( buf, "        0.00");
@@ -290,7 +295,7 @@ prefix_ void senf::Collector::enter(float min, float avg, float max)
     if (min < accMin_) accMin_ = min;
     if (max > accMax_) accMax_ = max;
     if (++i_ >= rank_) {
-        StatisticsBase::enter(accMin_, accAvg_ / rank_, accMax_);
+        StatisticsBase::enter(accMin_, accAvg_ / i_, accMax_);
         i_ = 0;
         accMin_ = FLT_MAX;
         accAvg_ = 0.0f;