//------------------------------------------------------------ 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);
}
//------------------------------------------------------------------------------
//--------------------------------------------------------- Engine::addConcept()
//------------------------------------------------------------------------------
-int Engine::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample) throw() {
+int Engine::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample) {
a_sequence_concept_id++;
_concept_identification_t aux;
aux.SampleFile = ""; // sample dump disabled by default for new concepts
//------------------------------------------------------------------------------
//--------------------------------------------------------- Engine::getConcept()
//------------------------------------------------------------------------------
-bool Engine::getConcept(const int & id, std::string & description, std::string & unit, bool & integerNatureSample) const throw() {
+bool Engine::getConcept(const int & id, std::string & description, std::string & unit, bool & integerNatureSample) const {
_concept_identification_map_iter it = a_concept_identification_map.find(id);
if(it == a_concept_identification_map.end()) return false;
//------------------------------------------------------------------------------
//---------------------------------------------------- Engine::enableSampleLog()
//------------------------------------------------------------------------------
-bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw() {
+bool Engine::enableSampleLog(const int & id, const char *sampleFileName) {
_concept_identification_map_nc_iter it;
std::string providedName = sampleFileName ? sampleFileName : "sample";
std::string *SampleFile_ptr;
// 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;
}
//------------------------------------------------------------------------------
//--------------------------------------------------- Engine::disableSampleLog()
//------------------------------------------------------------------------------
-bool Engine::disableSampleLog(const int & id) throw() {
- _concept_identification_map_nc_iter it = a_concept_identification_map.find(id);
+bool Engine::disableSampleLog(const int & 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 */, "");
}
//------------------------------------------------------------------------------
//--------------------------------------------------- Engine::disableSampleLog()
//------------------------------------------------------------------------------
-bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTimestamp, const double & value) const throw() {
+bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTimestamp, const double & value) const {
anna::Guard guard(a_mutex);
_concept_identification_map_iter it = a_concept_identification_map.find(conceptId);
//------------------------------------------------------------------------------
-//----------------------------------------------------------- Engine::asString()
+//-------------------------------------------------- Engine::createAccumulator()
//------------------------------------------------------------------------------
-Accumulator *Engine::createAccumulator() throw() {
- Accumulator *result;
+Accumulator *Engine::createAccumulator(const std::string &name) noexcept(false) {
+ 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) {
+ 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;
}
//------------------------------------------------------------------------------
//----------------------------------------------------------- Engine::asString()
//------------------------------------------------------------------------------
-std::string Engine::asString(void) const throw() {
+std::string Engine::asString(void) const {
std::string trace;
_concept_identification_map_iter iter;
_concept_identification_map_iter iter_min(a_concept_identification_map.begin());
trace += "\n";
trace += "\n Concept id: "; trace += anna::functions::asString((*iter).first);
- if((*iter).second.SampleFile != "") trace += "\n Sample file: "; trace += (*iter).second.SampleFile;
+ if((*iter).second.SampleFile != "") { trace += "\n Sample file: "; trace += (*iter).second.SampleFile; }
trace += "\n Description: "; trace += (*iter).second.Description;
trace += "\n Unit: "; trace += (*iter).second.Unit;
}
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);
}
//------------------------------------------------------------------------------
//-------------------------------------------------------------- Engine::asXML()
//------------------------------------------------------------------------------
-anna::xml::Node* Engine::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const throw() {
+anna::xml::Node* Engine::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const {
anna::xml::Node* result = parent->createChild("anna.statistics.Engine");
_concept_identification_map_iter iter;
_concept_identification_map_iter iter_min(a_concept_identification_map.begin());
}
// 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;
}