X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatistics.cc;h=6513828374d8fe90f74c8d8291f947dd02684c3a;hb=23a1bdee20b3fb19bd442efed8aa73b2bf0d585a;hp=f2b9c9dbc7569bb7139ca33202d2540798a88c9e;hpb=92d091c2e5b387ca0c9930c7bc88d9b45630a845;p=senf.git

diff --git a/senf/Utils/Statistics.cc b/senf/Utils/Statistics.cc
index f2b9c9d..6513828 100644
--- a/senf/Utils/Statistics.cc
+++ b/senf/Utils/Statistics.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Statistics non-inline non-template implementation */
@@ -31,6 +36,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <senf/Utils/Format.hh>
+#include <senf/Utils/Console/STLSupport.hh>
 #include "StatisticsTargets.hh"
 
 //#include "Statistics.mpp"
@@ -103,16 +109,16 @@ prefix_ void senf::StatisticsBase::consoleList(unsigned level, std::ostream & os
 
     os << boost::format("%s%-5d%|15t|  %12.5g  %19.5g  %12.5g\n")
         % std::string(2*level,' ') % rank()
-        % fmt::eng(min()).setw() % fmt::eng(avg(),dev()).setw() % fmt::eng(max()).setw();
+        % fmt::eng(min()).setw().showbase() % fmt::eng(avg(),dev()).setw().showbase() % fmt::eng(max()).setw().showbase();
     {
         OutputMap::const_iterator i (outputs_.begin());
         OutputMap::const_iterator i_end (outputs_.end());
         for (; i != i_end; ++i)
             os << boost::format("            %3d  %12.5g  %19.5g  %12.5g\n")
                 % i->second.n
-                % fmt::eng(i->second.min).setw()
-                % fmt::eng(i->second.avg, i->second.dev).setw()
-                % fmt::eng(i->second.max).setw();
+                % fmt::eng(i->second.min).setw().showbase()
+                % fmt::eng(i->second.avg, i->second.dev).setw().showbase()
+                % fmt::eng(i->second.max).setw().showbase();
     }
     {
         Children::const_iterator i (children_.begin());
@@ -169,7 +175,7 @@ prefix_ senf::Statistics::Statistics()
 #endif
 {
 #ifndef SENF_DISABLE_CONSOLE
-    namespace fty = senf::console::factory;
+    namespace fty = console::factory;
 
     dir.add("list", fty::Command(&Statistics::consoleList, this)
             .doc("List statistics collection intervals and current values.\n"
@@ -222,11 +228,12 @@ prefix_ senf::Statistics::Statistics()
                  "the last 5 minutes.")
             .arg("rank","Rank chain selecting the value to generate output for")
             .arg("window","Optional size of sliding average window",
-                 senf::console::kw::default_value = 1u) );
+                 console::kw::default_value = 1u) );
 #endif
 }
 
 prefix_ void senf::Statistics::consoleList(std::ostream & os)
+    const
 {
     os << "RANK        WIN       MIN          AVG                   MAX\n";
     StatisticsBase::consoleList(0, os);