X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fstatistics%2FEngine.cpp;h=5417e4ec4528b8f203f9591de7d9b2d565d73b3a;hp=622e58ce860b57dbee5a05d8f7f7fb8c1d8e869c;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/statistics/Engine.cpp b/source/statistics/Engine.cpp index 622e58c..5417e4e 100644 --- a/source/statistics/Engine.cpp +++ b/source/statistics/Engine.cpp @@ -47,7 +47,7 @@ Engine::~Engine() { //------------------------------------------------------------------------------ //--------------------------------------------------------- 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 @@ -62,7 +62,7 @@ int Engine::addConcept(const std::string & description, const std::string & unit //------------------------------------------------------------------------------ //--------------------------------------------------------- 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; @@ -77,7 +77,7 @@ bool Engine::getConcept(const int & id, std::string & description, std::string & //------------------------------------------------------------------------------ //---------------------------------------------------- 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; @@ -113,7 +113,7 @@ bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw() //------------------------------------------------------------------------------ //--------------------------------------------------- Engine::disableSampleLog() //------------------------------------------------------------------------------ -bool Engine::disableSampleLog(const int & id) throw() { +bool Engine::disableSampleLog(const int & id) { if(id != -1) { _concept_identification_map_nc_iter it = a_concept_identification_map.find(id); @@ -134,7 +134,7 @@ bool Engine::disableSampleLog(const int & id) throw() { //------------------------------------------------------------------------------ //--------------------------------------------------- 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); @@ -161,7 +161,7 @@ bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTime //------------------------------------------------------------------------------ //-------------------------------------------------- Engine::createAccumulator() //------------------------------------------------------------------------------ -Accumulator *Engine::createAccumulator(const std::string &name) throw(anna::RuntimeException) { +Accumulator *Engine::createAccumulator(const std::string &name) noexcept(false) { Accumulator *result = getAccumulator(name); if (result) @@ -172,7 +172,7 @@ Accumulator *Engine::createAccumulator(const std::string &name) throw(anna::Runt return result; } -Accumulator* Engine::getAccumulator(const std::string &name) throw() { +Accumulator* Engine::getAccumulator(const std::string &name) { Accumulator *result = NULL; _accumulator_map_nc_it it = a_accumulators.find(name); @@ -186,7 +186,7 @@ Accumulator* Engine::getAccumulator(const std::string &name) throw() { //------------------------------------------------------------------------------ //----------------------------------------------------------- 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()); @@ -232,7 +232,7 @@ std::string Engine::asString(void) const throw() { //------------------------------------------------------------------------------ //-------------------------------------------------------------- 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());