X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fstatistics%2FAccumulator.hpp;h=6c76c781ec777390a178544f6ec2584254d6f10c;hb=f34b8069233e9e09208339bb79d8576c1ff962e1;hp=c13bbf1354005f05be8952fef93f51e95dd577d3;hpb=c6b62fd814b6e5b4e3ba65b6f092f6aa4e1d298d;p=anna.git

diff --git a/include/anna/statistics/Accumulator.hpp b/include/anna/statistics/Accumulator.hpp
index c13bbf1..6c76c78 100644
--- a/include/anna/statistics/Accumulator.hpp
+++ b/include/anna/statistics/Accumulator.hpp
@@ -85,6 +85,23 @@ typedef std::map <int, _concept_data_t>::const_iterator _concept_data_map_iter;
  * @short Contains statistical sample information
  */
 class Accumulator {
+
+  std::string a_name;
+
+  void initialize(const int & conceptId) ;
+  _concept_data_t * getConcept(const int & conceptId) const noexcept(false);
+  // Gets the data structure for a existing concept Id.
+  // Initializes and returns the new data structure for a new stored concept Id which is valid (exists for the engine).
+  // Launch exception if concept id is not a valid concept registered at Engine.
+
+  /*mutable */_concept_data_map_t a_concept_data_map;
+
+  std::string floatFormat(const int & numberOfDecimals) const ;
+
+  double getStandardDeviation(const _concept_data_t * conceptData) const noexcept(false);
+  double getBesselStandardDeviation(const _concept_data_t * conceptData) const noexcept(false);
+
+
 public:
 
   /**
@@ -97,7 +114,15 @@ public:
   /**
   * Destructor.
   */
-  ~Accumulator();
+  ~Accumulator() {;}
+
+
+  /**
+   * Sets the accumulator name
+   *
+   * @param name Name provided
+   */
+  void setName(const std::string &name) { a_name = name; }
 
   /**
   * Adds a new statistic concept through the accumulator, to ease the concept name creation,
@@ -109,21 +134,22 @@ public:
   *                            (is more intuitive 850 msecs than 0,850 secs). Then, it is @em true by default.
   *                            This is useful to advice better representation for some indicators like minimum/maximum
   *                             within integer samples.
+  * @param conceptNameFormat Format to register the complete concept name. Will be parsed using (in order) the provided
+  *                          description, and the accumulator name: '<concept description> [<accumulator name>]' by default.
   *
   * @return Assigned concept identification number (sequence)
   */
-  int addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample = true) throw();
-
+  int addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample = true, const char *conceptNameFormat = "%s [%s]") ;
 
   /**
-  * Process new value for the sample.
+  * Process new value for the sample regarding a concept identifier previously registered through the engine.
   *
   * @param conceptId statistical concept processed
   * @param value Value for processed item
   *
   * @see reset()
   */
-  void process(const int & conceptId, const double & value) throw(anna::RuntimeException);
+  void process(const int & conceptId, const double & value) noexcept(false);
 
 
   /**
@@ -131,7 +157,7 @@ public:
   *
   * @see process()
   */
-  void reset(void) throw();
+  void reset(void) ;
 
 
   /**
@@ -141,7 +167,7 @@ public:
   *
   * @see process()
   */
-  void reset(const int & conceptId) throw(anna::RuntimeException);
+  void reset(const int & conceptId) noexcept(false);
 
 
   /**
@@ -157,6 +183,13 @@ public:
 
   // Gets
 
+  /**
+   * Gets the accumulator name
+   *
+   * @result Accumulator name
+   */
+  const std::string &getName() const { return a_name; }
+
   /**
   * Gets current sample size for any concept id
   *
@@ -167,7 +200,7 @@ public:
   * @see getValue()
   * @see asXML()
   */
-  unsigned long long int sampleSize(const int & conceptId) const throw(anna::RuntimeException);
+  unsigned long long int sampleSize(const int & conceptId) const noexcept(false);
 
 
   /**
@@ -181,7 +214,7 @@ public:
   * @see sampleSize()
   * @see asXML()
   */
-  double getValue(const int & conceptId, const Operation::Type & operation) const throw(anna::RuntimeException);
+  double getValue(const int & conceptId, const Operation::Type & operation) const noexcept(false);
 
 
   /**
@@ -191,7 +224,7 @@ public:
   *
   * @return String with class content
   */
-  std::string asString(const int & numberOfDecimals = 2) const throw();
+  std::string asString(const int & numberOfDecimals = 2) const ;
 
 
   /**
@@ -201,24 +234,7 @@ public:
   *
   * @return XML with class content
   */
-  anna::xml::Node* asXML(anna::xml::Node* parent, const int & numberOfDecimals = 2) const throw();
-
-
-private:
-
-  std::string a_name;
-
-  void initialize(const int & conceptId) throw();
-  _concept_data_t * getConcept(const int & conceptId) const throw(anna::RuntimeException);
-  // Return NULL if no data is found for the concept Id
-  // Launch exception if concept id is not a valid concept registered at Engine
-
-  /*mutable */_concept_data_map_t a_concept_data_map;
-
-  std::string floatFormat(const int & numberOfDecimals) const throw();
-
-  double getStandardDeviation(const _concept_data_t * conceptData) const throw(anna::RuntimeException);
-  double getBesselStandardDeviation(const _concept_data_t * conceptData) const throw(anna::RuntimeException);
+  anna::xml::Node* asXML(anna::xml::Node* parent, const int & numberOfDecimals = 2) const ;
 };
 
 }