X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fstatistics%2FAccumulator.cpp;h=75eb76c155e67ef5bb17b2bfa19e95eb181557d2;hb=b0fce20be4095debc4b06b4b32fc9e6a8b1fa0fa;hp=358c87ccb94181fe934fae6dc6869d47b60e828e;hpb=c6b62fd814b6e5b4e3ba65b6f092f6aa4e1d298d;p=anna.git diff --git a/source/statistics/Accumulator.cpp b/source/statistics/Accumulator.cpp index 358c87c..75eb76c 100644 --- a/source/statistics/Accumulator.cpp +++ b/source/statistics/Accumulator.cpp @@ -32,22 +32,13 @@ using namespace anna::statistics; using namespace anna::time; -//****************************************************************************** -//------------------------------------------------------------------------------ -//-------------------------------------------------- Accumulator::~Accumulator() -//------------------------------------------------------------------------------ -Accumulator::~Accumulator() { -// LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "Destructor", ANNA_FILE_LOCATION)); - // TODO: anna::statistics::Engine::instantiate().releaseAccumulator(a_name); -} - // Private functions: //------------------------------------------------------------------------------ //---------------------------------------------------- Accumulator::initialize() //------------------------------------------------------------------------------ -void Accumulator::initialize(const int & conceptId) throw() { +void Accumulator::initialize(const int & conceptId) { _concept_data_t conceptData; conceptData.reset(); a_concept_data_map[conceptId] = conceptData; @@ -57,10 +48,8 @@ void Accumulator::initialize(const int & conceptId) throw() { //------------------------------------------------------------------------------ //---------------------------------------------------- Accumulator::addConcept() //------------------------------------------------------------------------------ -int Accumulator::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample) throw() { - std::string conceptName = description; - conceptName += ": "; - conceptName += a_name; +int Accumulator::addConcept(const std::string & description, const std::string & unit, const bool & integerNatureSample, const char *conceptNameFormat) { + std::string conceptName = anna::functions::asString(conceptNameFormat, description.c_str(), a_name.c_str()); return anna::statistics::Engine::instantiate().addConcept(conceptName, unit, integerNatureSample); } @@ -68,7 +57,7 @@ int Accumulator::addConcept(const std::string & description, const std::string & //------------------------------------------------------------------------------ //---------------------------------------------------- Accumulator::getConcept() //------------------------------------------------------------------------------ -_concept_data_t * Accumulator::getConcept(const int & conceptId) const throw(anna::RuntimeException) { +_concept_data_t *Accumulator::getConcept(const int & conceptId) const noexcept(false) { _concept_data_map_iter it = a_concept_data_map.find(conceptId); if(it == a_concept_data_map.end()) { // not found @@ -85,7 +74,6 @@ _concept_data_t * Accumulator::getConcept(const int & conceptId) const throw(ann Accumulator * nc_this = const_cast(this); nc_this->initialize(conceptId); - // (la otra posibilidad era hacer mutable el mapa e inicializar poniendo el contenido de 'initialize()') it = a_concept_data_map.find(conceptId); } @@ -96,7 +84,7 @@ _concept_data_t * Accumulator::getConcept(const int & conceptId) const throw(ann //------------------------------------------------------------------------------ //--------------------------------------------------- Accumulator::floatFormat() //------------------------------------------------------------------------------ -std::string Accumulator::floatFormat(const int & numberOfDecimals) const throw() { +std::string Accumulator::floatFormat(const int & numberOfDecimals) const { std::string result = "%."; result += anna::functions::asString(numberOfDecimals); result += "f"; @@ -104,13 +92,10 @@ std::string Accumulator::floatFormat(const int & numberOfDecimals) const throw() } - - - //------------------------------------------------------------------------------ //------------------------------------------ Accumulator::getStandardDeviation() //------------------------------------------------------------------------------ -double Accumulator::getStandardDeviation(const _concept_data_t * conceptData) const throw(anna::RuntimeException) { +double Accumulator::getStandardDeviation(const _concept_data_t * conceptData) const noexcept(false) { // SD = sqrt (1/N SUM (xi^2) - X^2) = sqrt (SquareSum / N - Average^2) if(conceptData->Size == 0) throw anna::RuntimeException("Divide by zero: sample size = 0 for Standard Deviation !!", ANNA_FILE_LOCATION); @@ -122,7 +107,7 @@ double Accumulator::getStandardDeviation(const _concept_data_t * conceptData) co //------------------------------------------------------------------------------ //------------------------------------ Accumulator::getBesselStandardDeviation() //------------------------------------------------------------------------------ -double Accumulator::getBesselStandardDeviation(const _concept_data_t * conceptData) const throw(anna::RuntimeException) { +double Accumulator::getBesselStandardDeviation(const _concept_data_t * conceptData) const noexcept(false) { // BSD = sqrt (1/(N-1) SUM (xi^2) - N/(N-1) X^2) = sqrt (SquareSum / (N-1) - N/(N-1) Average^2) if(conceptData->Size == 1) throw anna::RuntimeException("Divide by zero: sample size = 1 for bessel's Standard Deviation !!", ANNA_FILE_LOCATION); @@ -139,7 +124,7 @@ double Accumulator::getBesselStandardDeviation(const _concept_data_t * conceptDa //------------------------------------------------------------------------------ //------------------------------------------------------- Accumulator::process() //------------------------------------------------------------------------------ -void Accumulator::process(const int & conceptId, const double & value) throw(anna::RuntimeException) { +void Accumulator::process(const int & conceptId, const double & value) noexcept(false) { // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "process", ANNA_FILE_LOCATION)); Engine& engine = Engine::instantiate(); @@ -210,7 +195,7 @@ const Accumulator & Accumulator::operator = (const Accumulator & accumulator) { //------------------------------------------------------------------------------ //--------------------------------------------------------- Accumulator::reset() //------------------------------------------------------------------------------ -void Accumulator::reset(void) throw() { +void Accumulator::reset(void) { // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "reset", ANNA_FILE_LOCATION)); _concept_data_map_iter it; _concept_data_map_iter it_min(a_concept_data_map.begin()); @@ -227,10 +212,12 @@ void Accumulator::reset(void) throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Accumulator::reset() //------------------------------------------------------------------------------ -void Accumulator::reset(const int & conceptId) throw(anna::RuntimeException) { +void Accumulator::reset(const int & conceptId) noexcept(false) { // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "reset", ANNA_FILE_LOCATION)); - _concept_data_t *ptr_auxConceptData = getConcept(conceptId); - //if (ptr_auxConceptData == NULL) return; // Not possible: getConcept initializes it if not found. + _concept_data_t *ptr_auxConceptData = getConcept(conceptId); // will initialize if didn't associated to this accumulator, + // exception if engine knows nothing about such concept id. + //if (ptr_auxConceptData == NULL) return; // Not possible: getConcept initializes it if not found or exception was launched + // previously if the engine don't know the concept id. ptr_auxConceptData->reset(); } @@ -240,7 +227,7 @@ void Accumulator::reset(const int & conceptId) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //---------------------------------------------------- Accumulator::sampleSize() //------------------------------------------------------------------------------ -unsigned long long int Accumulator::sampleSize(const int & conceptId) const throw(anna::RuntimeException) { +unsigned long long int Accumulator::sampleSize(const int & conceptId) const noexcept(false) { // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "sampleSize", ANNA_FILE_LOCATION)); _concept_data_t *ptr_auxConceptData = getConcept(conceptId); //if (ptr_auxConceptData == NULL) return 0; // Not possible: getConcept initializes it if not found. @@ -251,7 +238,7 @@ unsigned long long int Accumulator::sampleSize(const int & conceptId) const thro //------------------------------------------------------------------------------ //------------------------------------------------------ Accumulator::getValue() //------------------------------------------------------------------------------ -double Accumulator::getValue(const int & conceptId, const Operation::Type & operation) const throw(anna::RuntimeException) { +double Accumulator::getValue(const int & conceptId, const Operation::Type & operation) const noexcept(false) { // LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "getValue", ANNA_FILE_LOCATION)); const _concept_data_t *ptr_auxConceptData = getConcept(conceptId); @@ -279,7 +266,7 @@ double Accumulator::getValue(const int & conceptId, const Operation::Type & oper //------------------------------------------------------------------------------ //------------------------------------------------------ Accumulator::asString() //------------------------------------------------------------------------------ -std::string Accumulator::asString(const int & numberOfDecimals) const throw() { +std::string Accumulator::asString(const int & numberOfDecimals) const { std::string trace; _concept_data_map_iter iter; _concept_data_map_iter iter_min(a_concept_data_map.begin()); @@ -373,7 +360,7 @@ std::string Accumulator::asString(const int & numberOfDecimals) const throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Accumulator::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const throw() { +anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberOfDecimals) const { anna::xml::Node* result = parent->createChild("anna.statistics.Accumulator"); result->createAttribute("Name", a_name); _concept_data_map_iter iter; @@ -408,7 +395,7 @@ anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberO concept->createAttribute("Id", conceptId); concept->createAttribute("Description", conceptDescription); concept->createAttribute("Unit", conceptUnitDescription); - anna::xml::Node* data = concept->createChild("Data"); + anna::xml::Node* data = concept->createChild("Sample"); if(ptrConceptData->Size != 0) { data->createAttribute("Size", anna::functions::asString((anna::U64)ptrConceptData->Size)); @@ -453,7 +440,7 @@ anna::xml::Node* Accumulator::asXML(anna::xml::Node* parent, const int & numberO data->createAttribute("ProcessingRate", cad_aux); } } else { - concept->createAttribute("Data", "Not enough data to get statistics"); + concept->createAttribute("Sample", "Not enough data to get statistics"); } }