X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatistics.cc;h=01122b28278165b3ab727dd20cd4991c8ad710a3;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=0e1965fd315a478a292f3102c9ce7d2354ff6c0a;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Utils/Statistics.cc b/senf/Utils/Statistics.cc index 0e1965f..01122b2 100644 --- a/senf/Utils/Statistics.cc +++ b/senf/Utils/Statistics.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 @@ -88,17 +88,17 @@ prefix_ void senf::StatisticsBase::consoleList(unsigned level, std::ostream & os { namespace fmt = senf::format; - os << boost::format("%s%-5d%|15t| %12.5g %19.5g %12.5g\n") - % std::string(2*level,' ') % rank() + 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(); { 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() + % i->second.n + % fmt::eng(i->second.min).setw() + % fmt::eng(i->second.avg, i->second.dev).setw() % fmt::eng(i->second.max).setw(); } { @@ -230,7 +230,7 @@ prefix_ void senf::Statistics::consoleCollect(std::vector & ranks) for (; i != i_end; ++i) stats = & (stats->collect(*i)); - + } prefix_ boost::shared_ptr @@ -239,7 +239,7 @@ senf::Statistics::consoleOutput(std::vector & ranks, unsigned window) StatisticsBase * stats (this); std::vector::const_iterator i (ranks.begin()); std::vector::const_iterator const i_end (ranks.end()); - + try { for (; i != i_end; ++i) stats = &(*stats)[*i]; @@ -248,7 +248,7 @@ senf::Statistics::consoleOutput(std::vector & ranks, unsigned window) for (; i != i_end; ++i) stats = & (stats->collect(*i)); - + return stats->output(window).dir().node().thisptr(); }