X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fstatistics%2FEngine.cpp;h=e804599713f8411ec08128b81e3f6019d21dd5c9;hb=5e4f1d9d5902d86a37ecf88b372d9089d417e663;hp=b90b6098288b7ed457f4d623e76a3b0cf4af7800;hpb=66409396bebc1cfeb63d404f3aee8639159298d5;p=anna.git

diff --git a/source/statistics/Engine.cpp b/source/statistics/Engine.cpp
index b90b609..e804599 100644
--- a/source/statistics/Engine.cpp
+++ b/source/statistics/Engine.cpp
@@ -39,8 +39,8 @@ Engine::Engine() {
 //------------------------------------------------------------ Engine::~Engine()
 //------------------------------------------------------------------------------
 Engine::~Engine() {
-  for (_accumulator_vector_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
-    delete (*it);
+  for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
+    delete (it->second);
 }
 
 
@@ -156,13 +156,26 @@ bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTime
 
 
 //------------------------------------------------------------------------------
-//----------------------------------------------------------- Engine::asString()
+//-------------------------------------------------- Engine::createAccumulator()
 //------------------------------------------------------------------------------
-Accumulator *Engine::createAccumulator() throw() {
-  Accumulator *result;
+Accumulator *Engine::createAccumulator(const std::string &name) throw(anna::RuntimeException) {
+  Accumulator *result = getAccumulator(name);
+
+  if (result)
+    throw anna::RuntimeException(anna::functions::asString("Cannot register another accumulator with the same name: %s", name.c_str()), ANNA_FILE_LOCATION);
+
+  result = new Accumulator(name);
+  a_accumulators[name] = result;
+  return result;
+}
+
+Accumulator* Engine::getAccumulator(const std::string &name) throw() {
+  Accumulator *result = NULL;
+
+  _accumulator_map_nc_it it = a_accumulators.find(name);
+  if (it != a_accumulators.end())
+    result = it->second;
 
-  result = new Accumulator();
-  a_accumulators.push_back(result);
   return result;
 }
 
@@ -201,6 +214,14 @@ std::string Engine::asString(void) const throw() {
   }
 
   trace += "\n";
+
+  // Accumulators:
+  trace += "\nNumber of accumulators= "; trace += anna::functions::asString(a_accumulators.size());
+  for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++) {
+    trace += "\n";
+    trace += it->second->asString();
+  }
+
   return (trace);
 }
 
@@ -230,10 +251,10 @@ anna::xml::Node* Engine::asXML(anna::xml::Node* parent, const int & numberOfDeci
   }
 
   // Accumulators:
-  for (_accumulator_vector_it it = a_accumulators.begin(); it != a_accumulators.end(); it++) {
-    anna::xml::Node* accumulators = result->createChild("anna.statistics.Accumulators");
-    (*it)->asXML(accumulators);
-  }
+  anna::xml::Node* accumulators = result->createChild("anna.statistics.Accumulators");
+  accumulators->createAttribute("RegisteredAccumulators", a_accumulators.size());
+  for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
+    it->second->asXML(accumulators);
 
   return result;
 }