using namespace anna::time;
-//******************************************************************************
-//------------------------------------------------------------------------------
-//--------------------------------------------------- Accumulator::Accumulator()
-//------------------------------------------------------------------------------
-
-// Default Constructor
-Accumulator::Accumulator() {
- //reset (); no sense
-}
-
-
-Accumulator::~Accumulator() {
-// LOGMETHOD (TraceMethod tttm ("anna::statistics::Accumulator", "Destructor", ANNA_FILE_LOCATION));
-}
-
-
-
// 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;
}
+//------------------------------------------------------------------------------
+//---------------------------------------------------- Accumulator::addConcept()
+//------------------------------------------------------------------------------
+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);
+}
+
+
//------------------------------------------------------------------------------
//---------------------------------------------------- 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
Accumulator * nc_this = const_cast<Accumulator *>(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);
}
//------------------------------------------------------------------------------
//--------------------------------------------------- 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";
}
-
-
-
//------------------------------------------------------------------------------
//------------------------------------------ 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);
//------------------------------------------------------------------------------
//------------------------------------ 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);
//------------------------------------------------------------------------------
//------------------------------------------------------- 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();
//------------------------------------------------------------------------------
//--------------------------------------------------------- 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());
//------------------------------------------------------------------------------
//--------------------------------------------------------- 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();
}
//------------------------------------------------------------------------------
//---------------------------------------------------- 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.
//------------------------------------------------------------------------------
//------------------------------------------------------ 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);
//------------------------------------------------------------------------------
//------------------------------------------------------ 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());
trace = "\n=====================";
trace += "\nStatistic Information";
trace += "\n=====================";
+ trace += "\nAccumulator name: ";
+ trace += a_name;
trace += "\nCurrent Time: ";
trace += time_now.asString();
//------------------------------------------------------------------------------
//--------------------------------------------------------- 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;
_concept_data_map_iter iter_min(a_concept_data_map.begin());
_concept_data_map_iter iter_max(a_concept_data_map.end());
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));
data->createAttribute("ProcessingRate", cad_aux);
}
} else {
- concept->createAttribute("Data", "Not enough data to get statistics");
+ concept->createAttribute("Sample", "Not enough data to get statistics");
}
}