reverted changes in Statistics.[hh][cci] from rev.1829 to anable

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

diff --git a/senf/Utils/Statistics.cci b/senf/Utils/Statistics.cci
index 0ed4fbd..8e7b093 100644 (file)
--- a/senf/Utils/Statistics.cci
+++ b/senf/Utils/Statistics.cci
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// 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 inline non-template implementation */
@@ -27,12 +32,13 @@
 
 // Custom includes
 #include <float.h>
+#include <senf/Utils/Console/ParsedCommand.hh>
 #include "Range.hh"
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase::Transform
 
 prefix_ senf::StatisticsBase::Transform::result_type
@@ -42,7 +48,7 @@ senf::StatisticsBase::Transform::operator()(first_argument_type i)
     return i.second;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase::OutputEntry
 
 prefix_ senf::StatisticsBase::OutputEntry::OutputEntry()
@@ -65,8 +71,8 @@ prefix_ senf::StatisticsBase::OutputEntry::OutputEntry(const OutputEntry& other)
 
 prefix_ void senf::StatisticsBase::OutputEntry::initDir()
 {
-    dir.add("list", senf::membind(&OutputEntry::consoleList, this))
-        .doc("List all known connected targets. This list might not be complete.");
+    dir.add("list", console::factory::Command(&OutputEntry::consoleList, this)
+            .doc("List all known connected targets. This list might not be complete.") );
 }
 
 prefix_ senf::StatisticsBase::OutputEntry &
@@ -80,15 +86,7 @@ senf::StatisticsBase::OutputEntry::operator=(const OutputEntry& other)
     return *this;
 }
 
-prefix_ void senf::StatisticsBase::OutputEntry::consoleList(std::ostream & os)
-{
-    for (boost::ptr_vector<TargetBase>::iterator i (targets_.begin());
-         i != targets_.end(); ++i)
-        if (! i->label.empty())
-            os << i->label << "\n";
-}
-
-/////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase
 
 prefix_ senf::StatisticsBase::StatisticsBase()
@@ -144,7 +142,12 @@ prefix_ std::string senf::StatisticsBase::path()
     return v_path();
 }
 
-///////////////////////////////////////////////////////////////////////////
+prefix_ senf::StatisticsData senf::StatisticsBase::data()
+{
+    return StatisticsData(min_, avg_, max_, dev_, 0);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Collector
 
 prefix_ senf::Collector::Collector(StatisticsBase * owner, unsigned rank)
@@ -165,26 +168,38 @@ senf::Collector::output(unsigned n)
     return StatisticsBase::OutputProxy<Collector>(this, StatisticsBase::output(n));
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Statistics
 
+prefix_ void senf::Statistics::operator()(unsigned n, float min, float avg, float max,
+                                          float dev)
+{
+    enter(n, min, avg, max, dev);
+}
+
 prefix_ void senf::Statistics::operator()(float min, float avg, float max, float dev)
 {
-    enter(min, avg, max, dev);
+    enter(1, min, avg, max, dev);
+}
+
+prefix_ void senf::Statistics::operator()(StatisticsData const & data)
+{
+  enter(1, data.min, data.avg, data.max, data.stddev);
 }
 
 prefix_ void senf::Statistics::operator()(float value, float dev)
 {
-    enter(value, value, value, dev);
+    enter(1, value, value, value, dev);
 }
 
+
 prefix_ senf::StatisticsBase::OutputProxy<senf::Statistics>
 senf::Statistics::output(unsigned n)
 {
     return StatisticsBase::OutputProxy<Statistics>(this, StatisticsBase::output(n));
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f