switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Utils/Statistics.cti b/senf/Utils/Statistics.cti
index d34b9ba..d620793 100644 (file)
--- a/senf/Utils/Statistics.cti
+++ b/senf/Utils/Statistics.cti
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // 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 template implementation */
@@ -28,14 +33,14 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::StatisticsBase::OutputProxy
 
 template <class Owner>
 prefix_ senf::StatisticsBase::OutputProxy<Owner>::OutputProxy(Owner * owner, OutputEntry * entry)
-    : owner_ (owner), entry_ (entry) 
+    : owner_ (owner), entry_ (entry)
 {}
 
 template <class Owner>
@@ -85,7 +90,18 @@ prefix_ senf::console::ScopedDirectory<> & senf::StatisticsBase::OutputProxy<Own
     return entry_->dir;
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// senf::Statistics
+
+template <class Value>
+prefix_ void senf::Statistics::operator()(unsigned n, StatisticAccumulator<Value> & sa)
+{
+    enter(n, float(sa.min()), sa.avg(), float(sa.max()), sa.stddev());
+    sa.clear();
+}
+
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f