X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fstatistics%2FMeter.hpp;h=c0bb9b9c8f1a3235654453ef3e95b9eeb6263e0f;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=3f1c5ace0bb5a9730bcc15d85fcf8bf8031b8223;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/statistics/Meter.hpp b/include/anna/statistics/Meter.hpp
index 3f1c5ac..c0bb9b9 100644
--- a/include/anna/statistics/Meter.hpp
+++ b/include/anna/statistics/Meter.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_statistics_Meter_hpp
@@ -76,7 +48,7 @@ public:
   /**
   * Constructor.
   */
-  Meter(const std::string & description);
+  Meter(const std::string & name);
 
   /**
   * Destructor.
@@ -87,13 +59,13 @@ public:
   /**
   * Sets the time control point for processing measure
   */
-  void setControlPoint(void) throw() { a_meter.setControlPoint(); }
+  void setControlPoint(void) { a_meter.setControlPoint(); }
 
 
   /**
   * Reset sample
   */
-  void reset(void) throw() { a_accumulator.reset(); }
+  void reset(void) { a_accumulator.reset(); }
 
 
   /**
@@ -101,7 +73,7 @@ public:
   *
   * @return Returns processed delay
   */
-  Millisecond process(void) throw() { a_accumulator.process(a_single_accumulator_concept_id, a_meter.getDelay()); return (a_meter.getDelay()); }
+  Millisecond process(void) { a_accumulator.process(a_single_accumulator_concept_id, a_meter.getDelay()); return (a_meter.getDelay()); }
 
 
   /**
@@ -120,7 +92,7 @@ public:
 //    /**
 //    * Gets accumulator information in order to extract statistics indicators
 //    */
-//    const Accumulator & getAccumulator(void) const throw() { return (a_accumulator); }
+//    const Accumulator & getAccumulator(void) const { return (a_accumulator); }
 
   /**
   * Gets accumulator value information (statistics indicators)
@@ -129,7 +101,7 @@ public:
   *
   * @return Value for solicited operation
   */
-  double getAccumulatorValue(const Operation::Type &operation) const throw() { return (a_accumulator.getValue(a_single_accumulator_concept_id, operation)); }
+  double getAccumulatorValue(const Operation::Type &operation) const { return (a_accumulator.getValue(a_single_accumulator_concept_id, operation)); }
 
 
   /**
@@ -139,7 +111,7 @@ public:
   *
   * @return String with class content
   */
-  std::string asString(const int & numberOfDecimals = 2) const throw();
+  std::string asString(const int & numberOfDecimals = 2) const ;
 
 
   /**
@@ -149,7 +121,7 @@ public:
   *
   * @return XML with class content
   */
-  anna::xml::Node* asXML(anna::xml::Node* parent, const int & numberOfDecimals = 2) const throw();
+  anna::xml::Node* asXML(anna::xml::Node* parent, const int & numberOfDecimals = 2) const ;