X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FStatisticAccumulator.ct;h=c720d3fea54ed5c9813923c240edb7e93d72db26;hb=55b4c5a3afcf821031cef2ca7089fbdfd77d513a;hp=401f5a0b4265a5fabfeacc2db0b5aafcd3a8df75;hpb=e6362dd29e4a128eb66739441ff82ca4a49141d5;p=senf.git

diff --git a/senf/Utils/StatisticAccumulator.ct b/senf/Utils/StatisticAccumulator.ct
index 401f5a0..c720d3f 100644
--- a/senf/Utils/StatisticAccumulator.ct
+++ b/senf/Utils/StatisticAccumulator.ct
@@ -2,23 +2,29 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.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):
+//   Mathias Kretschmer <mtk@berlios.de>
+//   Jens Moedeker <jmo@berlios.de>
 
 /** \file
     \brief StatisticAccumulator non-inline template implementation  */
@@ -32,19 +38,9 @@
 // senf::StatisticAccumulator<T>
 
 template <class T>
-prefix_ senf::StatisticAccumulator<T>::StatisticAccumulator( )
-    : sum_squared_(0),
-      sum_(0),
-      min_(0),
-      max_(0),
-      last_avg_(0),
-      count_(0)
-{
-}
-
-//template <class T>
-//prefix_ senf::StatisticAccumulator<T>::~StatisticAccumulator()
-//{ }
+prefix_ senf::StatisticAccumulator<T>::StatisticAccumulator()
+    : sum_squared_(0), sum_(0), min_(0), max_(0), last_avg_(0), count_(0)
+{ }
 
 template <class T>
 prefix_ float senf::StatisticAccumulator<T>::stddev()
@@ -61,6 +57,12 @@ prefix_ float senf::StatisticAccumulator<T>::stddev()
 }
 
 template <class T>
+prefix_ void senf::StatisticAccumulator<T>::setLastAvg( T value)
+{
+    last_avg_ = value;        
+}
+
+template <class T>
 prefix_ void senf::StatisticAccumulator<T>::accumulate( T value)
 {
     if (count_ == 0) {
@@ -81,20 +83,28 @@ prefix_ void senf::StatisticAccumulator<T>::accumulate( T value)
 template <class T>
 prefix_ void senf::StatisticAccumulator<T>::clear()
 {
-    last_avg_ = avg();
-    count_ = 0;
-    sum_squared_ = 0;
-    sum_ = min_ = max_ = 0;
+    if (count_ > 0) {
+        last_avg_ = avg();
+        count_ = 0;
+        sum_squared_ = 0;
+        sum_ = min_ = max_ = 0;
+    }
 }
 
 template <class T>
-prefix_ void senf::StatisticAccumulator<T>::data( StatisticsData &data_)
+prefix_ void senf::StatisticAccumulator<T>::data( StatisticsData &data_) const
 {
-    data_.min = (float) min_;
-    data_.avg = avg();
-    data_.max = (float) max_;
-    data_.stddev = stddev();
-    data_.count = count;
+    if (count_ == 0) {
+        data_.min = data_.avg = data_.max = last_avg_;
+        data_.stddev = 0.0;
+        data_.count = 0;
+    } else {
+        data_.min = (float) min_;
+        data_.avg = avg();
+        data_.max = (float) max_;
+        data_.stddev = stddev();
+        data_.count = count_;
+    }
 }