//------------------------------------------------------------ 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::asString()
+//-------------------------------------------------- Engine::createAccumulator()
//------------------------------------------------------------------------------
-Accumulator *Engine::createAccumulator(const std::string &name) 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.push_back(result);
+ 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;
}
// Accumulators:
trace += "\nNumber of accumulators= "; trace += anna::functions::asString(a_accumulators.size());
- for (_accumulator_vector_it it = a_accumulators.begin(); it != a_accumulators.end(); it++) {
+ for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++) {
trace += "\n";
- trace += (*it)->asString();
+ trace += it->second->asString();
}
return (trace);
// Accumulators:
anna::xml::Node* accumulators = result->createChild("anna.statistics.Accumulators");
accumulators->createAttribute("RegisteredAccumulators", a_accumulators.size());
- for (_accumulator_vector_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
- (*it)->asXML(accumulators);
+ for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++)
+ it->second->asXML(accumulators);
return result;
}