// $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 */
// 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
return i.second;
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::StatisticsBase::OutputEntry
prefix_ senf::StatisticsBase::OutputEntry::OutputEntry()
- : n(), min(), avg(), max()
+ : n(), min(), avg(), max(), dev()
{
initDir();
}
prefix_ senf::StatisticsBase::OutputEntry::OutputEntry(unsigned n_)
- : n(n_), min(), avg(), max()
+ : n(n_), min(), avg(), max(), dev()
{
initDir();
}
prefix_ senf::StatisticsBase::OutputEntry::OutputEntry(const OutputEntry& other)
- : n(other.n), min(other.min), avg(other.avg), max(other.max)
+ : n(other.n), min(other.min), avg(other.avg), max(other.max), dev(other.dev)
{
initDir();
}
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 &
min = other.min;
avg = other.avg;
max = other.max;
+ dev = other.dev;
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()
- : min_ (0.0f), avg_ (0.0f), max_ (0.0f), maxQueueLen_ (0u)
+ : min_ (0.0f), avg_ (0.0f), max_ (0.0f), dev_ (0.0f), maxQueueLen_ (0u)
{}
prefix_ senf::StatisticsBase::~StatisticsBase()
return max_;
}
+prefix_ float senf::StatisticsBase::dev()
+ const
+{
+ return dev_;
+}
+
prefix_ unsigned senf::StatisticsBase::rank()
const
{
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)
- : rank_ (rank), i_ (0u), accMin_ (FLT_MAX), accAvg_ (0.0f), accMax_ (-FLT_MAX),
+ : rank_ (rank), i_ (0u), accMin_ (FLT_MAX), accSum_ (0.0f), accSumSq_ (0.0f), accMax_ (-FLT_MAX),
owner_ (owner)
{}
return StatisticsBase::OutputProxy<Collector>(this, StatisticsBase::output(n));
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::Statistics
-prefix_ void senf::Statistics::operator()(float min, float avg, float max)
+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);
+ enter(1, min, avg, max, dev);
}
-prefix_ void senf::Statistics::operator()(float value)
+prefix_ void senf::Statistics::operator()(StatisticsData const & data)
{
- enter(value, value, value);
+ enter(1, data.min, data.avg, data.max, data.stddev);
}
+prefix_ void senf::Statistics::operator()(float value, float 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
projects / senf.git / blobdiff