X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fstatistics%2FEngine.cpp;h=79a23ce2b655d853ec05dd82583712e7fecb3f55;hb=0c533bf948a63d134c8001e16b15194b197cb99a;hp=b6e1ee1071b9d7a60af80062682f86de138aa26c;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git

diff --git a/source/statistics/Engine.cpp b/source/statistics/Engine.cpp
index b6e1ee1..79a23ce 100644
--- a/source/statistics/Engine.cpp
+++ b/source/statistics/Engine.cpp
@@ -9,7 +9,7 @@
 // Local
 #include <anna/statistics/Engine.hpp>
 #include <anna/statistics/internal/sccs.hpp>
-
+#include <anna/core/mt/Guard.hpp>
 #include <anna/core/functions.hpp>
 #include <anna/xml/xml.hpp>
 
@@ -24,6 +24,10 @@ using namespace anna::statistics;
 //******************************************************************************
 //----------------------------------------------------------------------- Engine
 //******************************************************************************
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------- Engine::Engine()
+//------------------------------------------------------------------------------
 Engine::Engine() {
   statistics::sccs::activate();
   a_enabled = false;
@@ -31,6 +35,15 @@ Engine::Engine() {
 }
 
 
+//------------------------------------------------------------------------------
+//------------------------------------------------------------ Engine::~Engine()
+//------------------------------------------------------------------------------
+Engine::~Engine() {
+  for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
+    delete (it->second);
+}
+
+
 //------------------------------------------------------------------------------
 //--------------------------------------------------------- Engine::addConcept()
 //------------------------------------------------------------------------------
@@ -86,12 +99,9 @@ bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw()
   // For all concepts:
   _concept_identification_map_nc_iter it_min(a_concept_identification_map.begin());
   _concept_identification_map_nc_iter it_max(a_concept_identification_map.end());
-
   for(it = it_min; it != it_max; it++) {
     realName = "";
-
     if(providedName != "") realName = anna::functions::asString("%s.%d.csv", providedName.c_str(), (*it).first);
-
     SampleFile_ptr = &((*it).second.SampleFile);
     *SampleFile_ptr = realName;
   }
@@ -104,14 +114,20 @@ bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw()
 //--------------------------------------------------- Engine::disableSampleLog()
 //------------------------------------------------------------------------------
 bool Engine::disableSampleLog(const int & id) throw() {
-  _concept_identification_map_nc_iter it = a_concept_identification_map.find(id);
 
-  if(it == a_concept_identification_map.end()) return false;
+  if(id != -1) {
+    _concept_identification_map_nc_iter it = a_concept_identification_map.find(id);
 
-  // Access to map
-  std::string *SampleFile_ptr = &((*it).second.SampleFile);
-  *SampleFile_ptr = "";
-  return true;
+    if(it == a_concept_identification_map.end()) return false;
+
+    // Access to map
+    std::string *SampleFile_ptr = &((*it).second.SampleFile);
+    *SampleFile_ptr = "";
+    return true;
+  }
+
+  // For all concepts:
+  return enableSampleLog(id /* -1 */, "");
 }
 
 
@@ -119,6 +135,8 @@ bool Engine::disableSampleLog(const int & id) throw() {
 //--------------------------------------------------- Engine::disableSampleLog()
 //------------------------------------------------------------------------------
 bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTimestamp, const double & value) const throw() {
+  anna::Guard guard(a_mutex);
+
   _concept_identification_map_iter it = a_concept_identification_map.find(conceptId);
 
   if(it == a_concept_identification_map.end()) return false;
@@ -139,6 +157,32 @@ bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTime
   return true;
 }
 
+
+//------------------------------------------------------------------------------
+//-------------------------------------------------- Engine::createAccumulator()
+//------------------------------------------------------------------------------
+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;
+
+  return result;
+}
+
+
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Engine::asString()
 //------------------------------------------------------------------------------
@@ -173,6 +217,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);
 }
 
@@ -201,6 +253,11 @@ anna::xml::Node* Engine::asXML(anna::xml::Node* parent, const int & numberOfDeci
     concept->createAttribute("IntegerNatureSample", (*iter).second.IntegerNatureSample ? "yes" : "no");
   }
 
+  // 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;
 }
-