X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fstatistics%2FEngine.cpp;h=79a23ce2b655d853ec05dd82583712e7fecb3f55;hb=0c533bf948a63d134c8001e16b15194b197cb99a;hp=5a48bd1c5463b30d70540b3c82e93733254fee71;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/statistics/Engine.cpp b/source/statistics/Engine.cpp index 5a48bd1..79a23ce 100644 --- a/source/statistics/Engine.cpp +++ b/source/statistics/Engine.cpp @@ -1,43 +1,15 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // // Local #include #include - +#include #include #include @@ -52,6 +24,10 @@ using namespace anna::statistics; //****************************************************************************** //----------------------------------------------------------------------- Engine //****************************************************************************** + +//------------------------------------------------------------------------------ +//------------------------------------------------------------- Engine::Engine() +//------------------------------------------------------------------------------ Engine::Engine() { statistics::sccs::activate(); a_enabled = false; @@ -59,6 +35,15 @@ Engine::Engine() { } +//------------------------------------------------------------------------------ +//------------------------------------------------------------ Engine::~Engine() +//------------------------------------------------------------------------------ +Engine::~Engine() { + for (_accumulator_map_it it = a_accumulators.begin(); it != a_accumulators.end(); it++) + delete (it->second); +} + + //------------------------------------------------------------------------------ //--------------------------------------------------------- Engine::addConcept() //------------------------------------------------------------------------------ @@ -114,12 +99,9 @@ bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw() // 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; } @@ -132,14 +114,20 @@ bool Engine::enableSampleLog(const int & id, const char *sampleFileName) throw() //--------------------------------------------------- Engine::disableSampleLog() //------------------------------------------------------------------------------ bool Engine::disableSampleLog(const int & id) throw() { - _concept_identification_map_nc_iter it = a_concept_identification_map.find(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 */, ""); } @@ -147,6 +135,8 @@ bool Engine::disableSampleLog(const int & id) throw() { //--------------------------------------------------- Engine::disableSampleLog() //------------------------------------------------------------------------------ bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTimestamp, const double & value) const throw() { + anna::Guard guard(a_mutex); + _concept_identification_map_iter it = a_concept_identification_map.find(conceptId); if(it == a_concept_identification_map.end()) return false; @@ -167,6 +157,32 @@ bool Engine::logSample(const int & conceptId, const anna::Millisecond & unixTime return true; } + +//------------------------------------------------------------------------------ +//-------------------------------------------------- Engine::createAccumulator() +//------------------------------------------------------------------------------ +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[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; +} + + //------------------------------------------------------------------------------ //----------------------------------------------------------- Engine::asString() //------------------------------------------------------------------------------ @@ -201,6 +217,14 @@ std::string Engine::asString(void) const throw() { } 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); } @@ -229,6 +253,11 @@ anna::xml::Node* Engine::asXML(anna::xml::Node* parent, const int & numberOfDeci concept->createAttribute("IntegerNatureSample", (*iter).second.IntegerNatureSample ? "yes" : "no"); } + // 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; } -