X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fstatistics%2FAccumulator.cpp;h=255489c1f361d3d05afb87b79c3c66a176c54400;hb=eb446c670d53aa275d78b366ef1faf2b32ca964e;hp=164470077de1f49186b9fc7e2c3b58de8f42ec08;hpb=66409396bebc1cfeb63d404f3aee8639159298d5;p=anna.git

diff --git a/source/statistics/Accumulator.cpp b/source/statistics/Accumulator.cpp
index 1644700..255489c 100644
--- a/source/statistics/Accumulator.cpp
+++ b/source/statistics/Accumulator.cpp
@@ -32,23 +32,6 @@ using namespace anna::statistics;
 using namespace anna::time;
 
 
-//******************************************************************************
-//------------------------------------------------------------------------------
-//--------------------------------------------------- Accumulator::Accumulator()
-//------------------------------------------------------------------------------
-
-// Default Constructor
-Accumulator::Accumulator() {
-  //reset (); no sense
-}
-
-
-Accumulator::~Accumulator() {
-// LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "Destructor", ANNA_FILE_LOCATION));
-}
-
-
-
 // Private functions:
 
 
@@ -62,10 +45,19 @@ void Accumulator::initialize(const int & conceptId) throw() {
 }
 
 
+//------------------------------------------------------------------------------
+//---------------------------------------------------- Accumulator::addConcept()
+//------------------------------------------------------------------------------
+int Accumulator::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample, const char *conceptNameFormat) throw() {
+  std::string conceptName = anna::functions::asString(conceptNameFormat, description.c_str(), a_name.c_str());
+  return anna::statistics::Engine::instantiate().addConcept(conceptName, unit, integerNatureSample);
+}
+
+
 //------------------------------------------------------------------------------
 //---------------------------------------------------- Accumulator::getConcept()
 //------------------------------------------------------------------------------
-_concept_data_t * Accumulator::getConcept(const int & conceptId) const throw(anna::RuntimeException) {
+_concept_data_t *Accumulator::getConcept(const int & conceptId) const throw(anna::RuntimeException) {
   _concept_data_map_iter it = a_concept_data_map.find(conceptId);
 
   if(it == a_concept_data_map.end()) {  // not found
@@ -82,7 +74,6 @@ _concept_data_t * Accumulator::getConcept(const int & conceptId) const throw(ann
 
     Accumulator * nc_this = const_cast<Accumulator *>(this);
     nc_this->initialize(conceptId);
-    // (la otra posibilidad era hacer mutable el mapa e inicializar poniendo el contenido de 'initialize()')
     it = a_concept_data_map.find(conceptId);
   }
 
@@ -101,9 +92,6 @@ std::string Accumulator::floatFormat(const int & numberOfDecimals) const throw()
 }
 
 
-
-
-
 //------------------------------------------------------------------------------
 //------------------------------------------ Accumulator::getStandardDeviation()
 //------------------------------------------------------------------------------
@@ -226,8 +214,10 @@ void Accumulator::reset(void) throw() {
 //------------------------------------------------------------------------------
 void Accumulator::reset(const int & conceptId) throw(anna::RuntimeException) {
 // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "reset", ANNA_FILE_LOCATION));
-  _concept_data_t *ptr_auxConceptData = getConcept(conceptId);
-  //if (ptr_auxConceptData == NULL) return; // Not possible: getConcept initializes it if not found.
+  _concept_data_t *ptr_auxConceptData = getConcept(conceptId); // will initialize if didn't associated to this accumulator,
+                                                               // exception if engine knows nothing about such concept id.
+  //if (ptr_auxConceptData == NULL) return; // Not possible: getConcept initializes it if not found or exception was launched
+                                            //               previously if the engine don't know the concept id.
   ptr_auxConceptData->reset();
 }
 
@@ -289,6 +279,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 +362,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());
@@ -402,7 +395,7 @@ anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberO
     concept->createAttribute("Id", conceptId);
     concept->createAttribute("Description", conceptDescription);
     concept->createAttribute("Unit", conceptUnitDescription);
-    anna::xml::Node* data = concept->createChild("Data");
+    anna::xml::Node* data = concept->createChild("Sample");
 
     if(ptrConceptData->Size != 0) {
       data->createAttribute("Size", anna::functions::asString((anna::U64)ptrConceptData->Size));
@@ -447,7 +440,7 @@ anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberO
         data->createAttribute("ProcessingRate", cad_aux);
       }
     } else {
-      concept->createAttribute("Data", "Not enough data to get statistics");
+      concept->createAttribute("Sample", "Not enough data to get statistics");
     }
   }