Include accumulators on statistics engine in order to centralize and ease asXML....

[anna.git] / source / statistics / Accumulator.cpp

diff --git a/source/statistics/Accumulator.cpp b/source/statistics/Accumulator.cpp
index 1644700..358c87c 100644 (file)
--- a/source/statistics/Accumulator.cpp
+++ b/source/statistics/Accumulator.cpp
@@ -34,21 +34,13 @@ using namespace anna::time;
 
 //******************************************************************************
 //------------------------------------------------------------------------------
-//--------------------------------------------------- Accumulator::Accumulator()
+//-------------------------------------------------- Accumulator::~Accumulator()
 //------------------------------------------------------------------------------
-
-// Default Constructor
-Accumulator::Accumulator() {
-  //reset (); no sense
-}
-
-
 Accumulator::~Accumulator() {
 // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "Destructor", ANNA_FILE_LOCATION));
+  // TODO: anna::statistics::Engine::instantiate().releaseAccumulator(a_name);
 }
 
-
-
 // Private functions:
 
 
@@ -62,6 +54,17 @@ void Accumulator::initialize(const int & conceptId) throw() {
 }
 
 
+//------------------------------------------------------------------------------
+//---------------------------------------------------- Accumulator::addConcept()
+//------------------------------------------------------------------------------
+int Accumulator::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample) throw() {
+  std::string conceptName = description;
+  conceptName += ": ";
+  conceptName += a_name;
+  return anna::statistics::Engine::instantiate().addConcept(conceptName, unit, integerNatureSample);
+}
+
+
 //------------------------------------------------------------------------------
 //---------------------------------------------------- Accumulator::getConcept()
 //------------------------------------------------------------------------------
@@ -289,6 +292,8 @@ std::string Accumulator::asString(const int & numberOfDecimals) const throw() {
   trace =  "\n=====================";
   trace +=  "\nStatistic Information";
   trace +=  "\n=====================";
+  trace += "\nAccumulator name: ";
+  trace += a_name;
   trace += "\nCurrent Time: ";
   trace += time_now.asString();
 
@@ -370,6 +375,7 @@ std::string Accumulator::asString(const int & numberOfDecimals) const throw() {
 //------------------------------------------------------------------------------
 anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const throw() {
   anna::xml::Node* result = parent->createChild("anna.statistics.Accumulator");
+  result->createAttribute("Name", a_name);
   _concept_data_map_iter iter;
   _concept_data_map_iter iter_min(a_concept_data_map.begin());
   _concept_data_map_iter iter_max(a_concept_data_map.end());