diff --git a/.gitignore b/.gitignore index 75529fc5f4aa76a3d05ec393c2241d80d8c6b008..f2173098e4fb8d141056e4d509b9410698bd6ab8 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,6 @@ doc/* debug.sh release.sh +# local files +local/ + diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf index db75a910e81e1bd6ca1cd4a818850550c64f5312..12f14103af27d9614f77487f62f4de1a7b10db90 100644 --- a/aarbology2/makefile.conf +++ b/aarbology2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aarbology2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aarbology2/src/aarbology.cpp b/aarbology2/src/aarbology.cpp index 64f74261fa7e82505b43efc5c49b79b06b54b2d9..eadd53859d12056cd241e238d8585f9d0e4df855 100644 --- a/aarbology2/src/aarbology.cpp +++ b/aarbology2/src/aarbology.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -26,7 +27,6 @@ #include <arbology/exact/ExactSubtreeAutomaton.h> #include <arbology/exact/ExactTreePatternAutomaton.h> #include <arbology/transform/BeginToEndIndex.h> -#include <chrono> int main ( int argc, char * argv[] ) { try { @@ -82,8 +82,8 @@ int main ( int argc, char * argv[] ) { } else { } - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::deque < std::deque < sax::Token > > subjectTokens; @@ -127,45 +127,45 @@ int main ( int argc, char * argv[] ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = arbology::exact::ExactSubtreeMatch::match ( subject, pattern ); if( ends.isSet ( ) ) res = arbology::transform::BeginToEndIndex::transform(subject, res); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "exactPatternMatch" ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = arbology::exact::ExactPatternMatch::match ( subject, pattern ); if( ends.isSet ( ) ) res = arbology::transform::BeginToEndIndex::transform(subject, res); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "boyerMooreHorspool" ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = arbology::exact::BoyerMooreHorspool::match ( subject, pattern ); if( ends.isSet ( ) ) res = arbology::transform::BeginToEndIndex::transform(subject, res); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "reversedBoyerMooreHorspool" ) { @@ -187,15 +187,15 @@ int main ( int argc, char * argv[] ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = arbology::exact::KnuthMorrisPratt::match ( subject, pattern ); if( ends.isSet ( ) ) res = arbology::transform::BeginToEndIndex::transform(subject, res); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "deadZoneUsingBadCharacterShiftAndBorderArray" ) { @@ -216,49 +216,49 @@ int main ( int argc, char * argv[] ) { } else if ( algorithm.getValue ( ) == "exactSubtreeMatchingAutomaton" ) { tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = arbology::exact::ExactSubtreeMatchingAutomaton::construct ( pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "exactPatternMatchingAutomaton" ) { tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = arbology::exact::ExactPatternMatchingAutomaton::construct ( pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "exactSubtreeAutomaton" ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = arbology::exact::ExactSubtreeAutomaton::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "exactTreePatternAutomaton" ) { tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = arbology::exact::ExactTreePatternAutomaton::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else { @@ -266,10 +266,10 @@ int main ( int argc, char * argv[] ) { return 1; } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/acast2/makefile.conf b/acast2/makefile.conf index 7a188c98e3319ff4c2f06e180ef12eb9ed5ab4b0..a5098aee34aa9ad0e085a69b9b8eeb19c9ae5f46 100644 --- a/acast2/makefile.conf +++ b/acast2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=acast2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/acast2/src/acast.cpp b/acast2/src/acast.cpp index 39e3d92b6b92bdfebeb45dcf5752bfcb88a7cbf1..482ed4da9fcb31630be2a707dc1459d4937855f0 100644 --- a/acast2/src/acast.cpp +++ b/acast2/src/acast.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -40,8 +41,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { if(input.getValue() == "-") { @@ -55,20 +56,20 @@ int main(int argc, char** argv) { alib::Object in = alib::XmlDataFactory::fromTokens<alib::Object>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Cast", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Cast", measurements::Type::MAIN); alib::Object res = alib::castApi::getCastPool(type.getValue()).cast(in.getData()); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/acompaction2/makefile.conf b/acompaction2/makefile.conf index 547474858a6c65bcd40c540d0acd0a85fc27e43c..4c4f770fffd969c421789324482b7388d29d567f 100644 --- a/acompaction2/makefile.conf +++ b/acompaction2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=acompaction2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/acompaction2/src/acompaction.cpp b/acompaction2/src/acompaction.cpp index a6e6245e4eb79d37711801be6953e7c56fec9924..556c71f58b3a955a67b0a1442435704a2e57359c 100644 --- a/acompaction2/src/acompaction.cpp +++ b/acompaction2/src/acompaction.cpp @@ -7,12 +7,12 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <iostream> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" #include "automaton/transform/Compaction.h" -#include <chrono> int main(int argc, char** argv) { @@ -35,8 +35,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -51,20 +51,20 @@ int main(int argc, char** argv) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::Compaction::convert(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/acompare2/makefile.conf b/acompare2/makefile.conf index b7f4c520764f22bf560f7790e45ef5c92459cbdf..ee0aec454371c0b58807f49c104a3fb695530ee2 100644 --- a/acompare2/makefile.conf +++ b/acompare2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=acompare2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/acompare2/src/acompare.cpp b/acompare2/src/acompare.cpp index 308b1cb365bf378e13a8c0329aaadc642c87c2a1..1a75f8b3cf6beb33e5cbe994305e5cb001253498 100644 --- a/acompare2/src/acompare.cpp +++ b/acompare2/src/acompare.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include "factory/XmlDataFactory.hpp" #include "exception/AlibException.h" @@ -39,8 +40,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens1; if(input1.isSet()) { @@ -78,24 +79,24 @@ int main(int argc, char** argv) { automaton::Automaton automaton1 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens1); automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Compare", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Compare", measurements::Type::MAIN); res = AutomatonCompare::compare(automaton1, automaton2); } else if(alib::XmlDataFactory::first<grammar::Grammar>(tokens1) && alib::XmlDataFactory::first<grammar::Grammar>(tokens2)) { grammar::Grammar grammar1 = alib::XmlDataFactory::fromTokens<grammar::Grammar>(tokens1); grammar::Grammar grammar2 = alib::XmlDataFactory::fromTokens<grammar::Grammar>(tokens2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Compare", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Compare", measurements::Type::MAIN); res = GrammarCompare::compare(grammar1, grammar2); } else { throw exception::AlibException("Only automata and grammars can be compared."); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); return res; } catch (const exception::AlibException& exception) { diff --git a/aconversions2/makefile.conf b/aconversions2/makefile.conf index b8b6b2e54761330364b9390bbcbb3e726a0a74a2..50b6fecd277a6151778ac0be73a12ab81914e727 100644 --- a/aconversions2/makefile.conf +++ b/aconversions2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aconversions2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aconversions2/src/ConversionHandler.cpp b/aconversions2/src/ConversionHandler.cpp index 4ac215a03662c1bc46546d3372fe5d986cf9e92d..cb0bd615b5cd11cc0183b922f082bd1bbc732167 100644 --- a/aconversions2/src/ConversionHandler.cpp +++ b/aconversions2/src/ConversionHandler.cpp @@ -5,6 +5,7 @@ * Author: Tomas Pecka */ +#include <measure> #include "ConversionHandler.h" #include "automaton/convert/ToRegExpStateElimination.h" @@ -101,15 +102,15 @@ void ConversionHandler::convertFAtoRE( void ) { const automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case BRZOZOWSKI_ALGEBRAIC: { regexp::RegExp regexp = automaton::convert::ToRegExpAlgebraic::convert( automaton ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(regexp); break; @@ -118,8 +119,8 @@ void ConversionHandler::convertFAtoRE( void ) case DEFAULT: { regexp::RegExp regexp = automaton::convert::ToRegExpStateElimination::convert(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( regexp ); break; @@ -133,15 +134,15 @@ void ConversionHandler::convertFAtoRG( void ) { const automaton::Automaton fsm = alib::XmlDataFactory::fromTokens<automaton::Automaton>( m_tokens ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case INCOMING_TRANSITIONS: { grammar::LeftRG grammar = automaton::convert::ToGrammarLeftRG::convert(fsm); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( grammar ); break; @@ -150,8 +151,8 @@ void ConversionHandler::convertFAtoRG( void ) case DEFAULT: { grammar::RightRG grammar = automaton::convert::ToGrammarRightRG::convert(fsm); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(grammar); break; @@ -167,15 +168,15 @@ void ConversionHandler::convertREtoFA( void ) { const regexp::RegExp regexp = alib::XmlDataFactory::fromTokens<regexp::RegExp>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case BRZOZOWSKI_DERIVATION: { automaton::DFA automaton = regexp::convert::ToAutomatonDerivation::convert(regexp); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(automaton); break; @@ -183,8 +184,8 @@ void ConversionHandler::convertREtoFA( void ) case THOMPSON_NFA: { automaton::EpsilonNFA automaton = regexp::convert::ToAutomatonThompson::convert(regexp); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(automaton); break; @@ -193,8 +194,8 @@ void ConversionHandler::convertREtoFA( void ) case DEFAULT: { automaton::NFA automaton = regexp::convert::ToAutomatonGlushkov::convert(regexp); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(automaton); break; @@ -208,15 +209,15 @@ void ConversionHandler::convertREtoRG( void ) { const regexp::RegExp regexp = alib::XmlDataFactory::fromTokens<regexp::RegExp>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch(m_algorithm) { case BRZOZOWSKI_DERIVATION: { grammar::RightRG grammar = regexp::convert::ToGrammarRightRGDerivation::convert(regexp); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( grammar ); break; @@ -225,8 +226,8 @@ void ConversionHandler::convertREtoRG( void ) case DEFAULT: { grammar::RightRG grammar = regexp::convert::ToGrammarRightRGGlushkov::convert(regexp); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( grammar ); break; @@ -241,15 +242,15 @@ void ConversionHandler::convertREtoRG( void ) void ConversionHandler::convertRGtoFA( void ) { const grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case DEFAULT: { automaton::Automaton automaton = grammar::convert::ToAutomaton::convert(grammar); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( automaton ); break; @@ -262,16 +263,16 @@ void ConversionHandler::convertRGtoFA( void ) { void ConversionHandler::convertRGtoRE( void ) { const grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case BRZOZOWSKI_ALGEBRAIC: case DEFAULT: { regexp::RegExp regexp = grammar::convert::ToRegExpAlgebraic::convert(grammar); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( regexp ); break; @@ -285,16 +286,16 @@ void ConversionHandler::convertCFGtoPDA( void ) { const grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>(m_tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); switch( m_algorithm ) { case TOP_DOWN: { automaton::Automaton automaton = grammar::convert::ToAutomaton::convert(grammar); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( automaton ); break; @@ -302,8 +303,8 @@ void ConversionHandler::convertCFGtoPDA( void ) case BOTTOM_UP: { automaton::Automaton automaton = grammar::convert::ToAutomatonBottomUp::convert(grammar); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( automaton ); break; diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp index 284dca48c52b3923ab73e0743e01cb55d2e63443..ea546491fe2c8de0292b6112522209eba9421dcf 100644 --- a/aconversions2/src/aconversion.cpp +++ b/aconversions2/src/aconversion.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <sax/SaxParseInterface.h> #include <sax/ParserException.h> @@ -45,8 +46,8 @@ int main(int argc, char* argv[]) if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> inputTokens; if(input.isSet()) { @@ -62,10 +63,10 @@ int main(int argc, char* argv[]) ConversionHandler conv( inputTokens, target.getValue(), algorithm.getValue() ); conv.convert( ); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/aconvert2/makefile.conf b/aconvert2/makefile.conf index 92c350ec3df42e1ac7533339ae72d39a6f7751b6..65c384c6732901e9082efc0c85377dea012b2be2 100644 --- a/aconvert2/makefile.conf +++ b/aconvert2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aconvert2 -LINK_PATHS=../alib2str/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2str alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2str/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2str alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aconvert2/src/aconvert.cpp b/aconvert2/src/aconvert.cpp index 9c2965ea8a7d8161e22d9430f359fd0dbd5f65cf..da0c9c5aa30607b68cfab2b8d8ba8a7e41b86e65 100644 --- a/aconvert2/src/aconvert.cpp +++ b/aconvert2/src/aconvert.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <fstream> #include "factory/XmlDataFactory.hpp" @@ -20,8 +21,8 @@ void automatonFromString ( std::istream & in, std::ostream & out ) { automaton::Automaton automaton = alib::StringDataFactory::fromStream < automaton::Automaton > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStream ( automaton, out ); } @@ -29,8 +30,8 @@ void automatonFromString ( std::istream & in, std::ostream & out ) { void grammarFromString ( std::istream & in, std::ostream & out ) { grammar::Grammar grammar = alib::StringDataFactory::fromStream < grammar::Grammar > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStream ( grammar, out ); } @@ -38,8 +39,8 @@ void grammarFromString ( std::istream & in, std::ostream & out ) { void regexpFromString ( std::istream & in, std::ostream & out ) { regexp::RegExp regexp = alib::StringDataFactory::fromStream < regexp::RegExp > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStream ( regexp, out ); } @@ -47,8 +48,8 @@ void regexpFromString ( std::istream & in, std::ostream & out ) { void stringFromString ( std::istream & in, std::ostream & out ) { string::String string = alib::StringDataFactory::fromStream < string::String > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStream ( string, out ); } @@ -56,8 +57,8 @@ void stringFromString ( std::istream & in, std::ostream & out ) { void treeFromString ( std::istream & in, std::ostream & out ) { tree::Tree tree = alib::StringDataFactory::fromStream < tree::Tree > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStream ( tree, out ); } @@ -65,8 +66,8 @@ void treeFromString ( std::istream & in, std::ostream & out ) { void automatonToString ( std::istream & in, std::ostream & out ) { automaton::Automaton automaton = alib::XmlDataFactory::fromStream < automaton::Automaton > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::StringDataFactory::toStream ( automaton, out ); } @@ -74,8 +75,8 @@ void automatonToString ( std::istream & in, std::ostream & out ) { void grammarToString ( std::istream & in, std::ostream & out ) { grammar::Grammar grammar = alib::XmlDataFactory::fromStream < grammar::Grammar > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::StringDataFactory::toStream ( grammar, out ); } @@ -83,8 +84,8 @@ void grammarToString ( std::istream & in, std::ostream & out ) { void regexpToString ( std::istream & in, std::ostream & out ) { regexp::RegExp regexp = alib::XmlDataFactory::fromStream < regexp::RegExp > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::StringDataFactory::toStream ( regexp, out ); } @@ -92,8 +93,8 @@ void regexpToString ( std::istream & in, std::ostream & out ) { void stringToString ( std::istream & in, std::ostream & out ) { string::String string = alib::XmlDataFactory::fromStream < string::String > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::StringDataFactory::toStream ( string, out ); } @@ -101,8 +102,8 @@ void stringToString ( std::istream & in, std::ostream & out ) { void treeToString ( std::istream & in, std::ostream & out ) { tree::Tree tree = alib::XmlDataFactory::fromStream < tree::Tree > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::StringDataFactory::toStream ( tree, out ); } @@ -110,8 +111,8 @@ void treeToString ( std::istream & in, std::ostream & out ) { void automatonToDot ( std::istream & in, std::ostream & out ) { automaton::Automaton automaton = alib::XmlDataFactory::fromStream < automaton::Automaton > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); DotConverter::convert ( out, automaton ); } @@ -119,8 +120,8 @@ void automatonToDot ( std::istream & in, std::ostream & out ) { void automatonToGasTex ( std::istream & in, std::ostream & out ) { automaton::Automaton automaton = alib::XmlDataFactory::fromStream < automaton::Automaton > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); GasTexConverter::convert ( out, automaton ); } @@ -128,8 +129,8 @@ void automatonToGasTex ( std::istream & in, std::ostream & out ) { void automatonToTikZ ( std::istream & in, std::ostream & out ) { automaton::Automaton automaton = alib::XmlDataFactory::fromStream < automaton::Automaton > ( in ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); TikZConverter::convert ( out, automaton ); } @@ -194,8 +195,8 @@ int main ( int argc, char * argv[] ) { if ( measure.isSet ( ) ) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::istream * in = NULL; @@ -238,10 +239,10 @@ int main ( int argc, char * argv[] ) { if ( input.isSet ( ) && ( input.getValue ( ) != "-" ) ) delete in; - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/aderivation2/makefile.conf b/aderivation2/makefile.conf index 306df6e1e16a3ee01259695c60c3d62fbe241d57..b1f0c823f3680c9d8357b656dd9aaf1893be5c17 100644 --- a/aderivation2/makefile.conf +++ b/aderivation2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aderivation2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aderivation2/src/aderivation.cpp b/aderivation2/src/aderivation.cpp index 215aa49294c515fcd15af429bc8e521c9debd3f4..8bc14912aeea080ddd86da69ccce4fe7f8258363 100644 --- a/aderivation2/src/aderivation.cpp +++ b/aderivation2/src/aderivation.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -35,8 +36,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> stringTokens; if(string.isSet()) { @@ -63,20 +64,20 @@ int main(int argc, char** argv) { string::LinearString stringData = alib::XmlDataFactory::fromTokens<string::LinearString>(stringTokens); regexp::RegExp regexpData = alib::XmlDataFactory::fromTokens<regexp::RegExp>(regexpTokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); regexp::RegExp result = regexp::RegExpDerivation::derivation(regexpData, stringData); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(result); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/adeterminize2/makefile.conf b/adeterminize2/makefile.conf index 2232df4d2bc1d3472dd2fa98b11dd2331676291c..b3036edb084bafa85bf9a336060b6fca6203fb61 100644 --- a/adeterminize2/makefile.conf +++ b/adeterminize2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=adeterminize2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/adeterminize2/src/adeterminize.cpp b/adeterminize2/src/adeterminize.cpp index b0491cd0bfe8d3c4e9feddc71ed68dff3c6ce7e8..701149b5ef44fb87427d05f638d00ef34d7e5577 100644 --- a/adeterminize2/src/adeterminize.cpp +++ b/adeterminize2/src/adeterminize.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include "automaton/Automaton.h" #include "factory/XmlDataFactory.hpp" @@ -33,8 +34,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -49,20 +50,20 @@ int main(int argc, char** argv) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::determinize::Determinize::determinize(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/aecho2/makefile.conf b/aecho2/makefile.conf index 06857bf570dddede9520dd90411e0bc4c5b9dee2..aec2b730f8f60680b3fea1a9a01b69459e7daf6f 100644 --- a/aecho2/makefile.conf +++ b/aecho2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aecho2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aecho2/src/aecho.cpp b/aecho2/src/aecho.cpp index a293e20238aa34f65834dcf527fe2e485be3d9be..959ec823538fb882f68ede20fb9f682cf6048a9d 100644 --- a/aecho2/src/aecho.cpp +++ b/aecho2/src/aecho.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -14,8 +15,6 @@ #include <sax/ParserException.h> #include <object/Object.h> -#include <chrono> - int main(int argc, char** argv) { try { TCLAP::CmdLine cmd("echo binary", ' ', "0.01"); @@ -36,8 +35,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -52,15 +51,15 @@ int main(int argc, char** argv) { alib::Object object = alib::XmlDataFactory::fromTokens<alib::Object>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(object); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/aepsilon2/makefile.conf b/aepsilon2/makefile.conf index c9c510264cdea0357360f91bb21e0c6d675fbfb7..e2ce7faaf0f009533b46eba0b53d69810b4ab32d 100644 --- a/aepsilon2/makefile.conf +++ b/aepsilon2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aepsilon2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aepsilon2/src/aepsilon.cpp b/aepsilon2/src/aepsilon.cpp index 1ed3a7c0f8db7be5966299ec8d253cc72ee2443e..952f111d5a24dc05d2ab3da745fb411fbf2f858b 100644 --- a/aepsilon2/src/aepsilon.cpp +++ b/aepsilon2/src/aepsilon.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -46,8 +47,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -63,42 +64,42 @@ int main(int argc, char** argv) { if(algorithm.getValue() == "outgoing") { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if(efficient.getValue()) { automaton::Automaton res = automaton::simplify::efficient::EpsilonRemoverOutgoing::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else { automaton::Automaton res = automaton::simplify::EpsilonRemoverOutgoing::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } } else if(algorithm.getValue() == "incoming") { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if(efficient.getValue()) { automaton::Automaton res = automaton::simplify::efficient::EpsilonRemoverIncoming::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else { automaton::Automaton res = automaton::simplify::EpsilonRemoverIncoming::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } @@ -106,34 +107,34 @@ int main(int argc, char** argv) { if(alib::XmlDataFactory::first<automaton::Automaton>(tokens)) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if(efficient.getValue()) { automaton::Automaton res = automaton::simplify::EpsilonRemoverIncoming::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else { automaton::Automaton res = automaton::simplify::efficient::EpsilonRemoverIncoming::remove(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } } else if(alib::XmlDataFactory::first<grammar::Grammar>(tokens)) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); grammar::Grammar res = grammar::simplify::EpsilonRemover::remove(grammar); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else @@ -142,10 +143,10 @@ int main(int argc, char** argv) { throw exception::AlibException("Invalid algorithm"); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/agenerate2/makefile.conf b/agenerate2/makefile.conf index c022399a540e1abdbcf258b45bac0fd8637372f8..13312db927e35dc664a6d8699a151a0fe35d8a8f 100644 --- a/agenerate2/makefile.conf +++ b/agenerate2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=agenerate2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/agenerate2/src/agenerate.cpp b/agenerate2/src/agenerate.cpp index 93ec7fbc018e71a68fb5ffce6c831473de70e711..544ab10539e3005fcfb8383283e00610fba34202 100644 --- a/agenerate2/src/agenerate.cpp +++ b/agenerate2/src/agenerate.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -53,8 +54,8 @@ int main ( int argc, char * argv[] ) { if ( measure.isSet ( ) ) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::deque < sax::Token > stringTokens; @@ -79,36 +80,36 @@ int main ( int argc, char * argv[] ) { if ( ( type.getValue ( ) == "upTo" ) && upto.isSet ( ) ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( grammarTokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < string::LinearString > res = grammar::generate::GenerateUpToLength::generate ( grammar, upto.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "CYK" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( grammarTokens ); string::LinearString string = alib::XmlDataFactory::fromTokens < string::LinearString > ( stringTokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); bool res = grammar::generate::CockeYoungerKasami::generate ( grammar, string ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else { throw exception::AlibException ( "Invalid run type" ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/agraphbench2/src/agraphbench.cpp b/agraphbench2/src/agraphbench.cpp index 8efb0e1c05df933f1616c9b02dca1a0fe2c0dee0..6b83ba8d8dfd193237eaa3248b6c41ed866ea227 100644 --- a/agraphbench2/src/agraphbench.cpp +++ b/agraphbench2/src/agraphbench.cpp @@ -1,5 +1,6 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -34,18 +35,18 @@ int main(int argc, char** argv) { graph::UndirectedGraph ug2 = graph::generate::RandomGraphFactory::generateUndirectedIsomorphicGraph(ug1); ug2.setEmbedding(graph::embedding::HopcroftTarjan::hopcrofttarjan(ug2)); - std::chrono::measurements::start("HopcroftWong", std::chrono::measurements::Type::OVERALL); + measurements::start("HopcroftWong", measurements::Type::OVERALL); if (!graph::isomorphism::HopcroftWong::hopcroftwong(ug1, ug2)) std::cout << "FAIL: hopcroftwong returned false!" << std::endl; - std::chrono::measurements::end(); - std::clog << std::chrono::measurements::results() << std::endl; + measurements::end(); + std::cmeasure << measurements::results() << std::endl; if (!onlyhopcroft.isSet()) { - std::chrono::measurements::start("RecursiveByDefinition", std::chrono::measurements::Type::OVERALL); + measurements::start("RecursiveByDefinition", measurements::Type::OVERALL); if (!graph::isomorphism::Isomorphism::isomorphism(ug1, ug2)) std::cout << "FAIL: isomorphism returned false!" << std::endl; - std::chrono::measurements::end(); - std::clog << std::chrono::measurements::results() << std::endl; + measurements::end(); + std::cmeasure << measurements::results() << std::endl; } return 0; diff --git a/aintegral2/makefile.conf b/aintegral2/makefile.conf index a1c53a6e1cb52c748236b62c4133e5ffa62048ea..adcf20c63021bc8cf1549c3d8b192eb710df239a 100644 --- a/aintegral2/makefile.conf +++ b/aintegral2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aintegral2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aintegral2/src/aintegral.cpp b/aintegral2/src/aintegral.cpp index 7cecf8ecf14ae359380ef5803338f7711f60544e..64d0878de92c46b385d80c6a6da5b99c60b1afb5 100644 --- a/aintegral2/src/aintegral.cpp +++ b/aintegral2/src/aintegral.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -35,8 +36,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> stringTokens; if(string.isSet()) { @@ -63,20 +64,20 @@ int main(int argc, char** argv) { string::LinearString stringData = alib::XmlDataFactory::fromTokens<string::LinearString>(stringTokens); regexp::RegExp regexpData = alib::XmlDataFactory::fromTokens<regexp::RegExp>(regexpTokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); regexp::RegExp res = regexp::RegExpIntegral::integral(regexpData, stringData); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/alangop2/makefile.conf b/alangop2/makefile.conf index f4928e9ed84e22e0b847322270e9c08b8e871c4c..e7f3a350b988a6eafd7355f87f3408fe5c1c5a9b 100644 --- a/alangop2/makefile.conf +++ b/alangop2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=alangop2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alangop2/src/alangop.cpp b/alangop2/src/alangop.cpp index 52642cea1e2cc22fdf83075a8625ec432d628516..3b08a2289d6c6f2cbd9bca862a2c38946965fedf 100644 --- a/alangop2/src/alangop.cpp +++ b/alangop2/src/alangop.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -57,8 +58,8 @@ int main(int argc, char* argv[]) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> a1Tokens, a2Tokens; if(a1.isSet()) { @@ -86,94 +87,94 @@ int main(int argc, char* argv[]) { if( algorithm.getValue() == "unionEpsilon") { automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(a2Tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomataUnionEpsilonTransition::unification(automaton1, automaton2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "unionCartesian") { automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(a2Tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomataUnionCartesianProduct::unification(automaton1, automaton2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "concatenationEpsilon") { automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(a2Tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomataConcatenationEpsilonTransition::concatenation(automaton1, automaton2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "concatenation") { automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(a2Tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomataConcatenation::concatenation(automaton1, automaton2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "intersectionCartesian") { automaton::Automaton automaton2 = alib::XmlDataFactory::fromTokens<automaton::Automaton>(a2Tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomataIntersectionCartesianProduct::intersection(automaton1, automaton2); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "iteration") { - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomatonIteration::iteration(automaton1); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( algorithm.getValue() == "iterationEpsilon") { - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::AutomatonIterationEpsilonTransition::iteration(automaton1); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else { throw exception::AlibException( "Invalid algorithm" ); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch( const exception::AlibException & exception ) { diff --git a/alib2algo/makefile.conf b/alib2algo/makefile.conf index 4fc7438591868a1632d3dd06618f126330000c02..ad49479344cd45b3cb488d045efa6050325db5f4 100644 --- a/alib2algo/makefile.conf +++ b/alib2algo/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2algo TESTBIN:=alib2test -LINK_PATHS=../alib2str/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2str alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2str/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2str alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2data/src/factory/XmlDataFactory.hpp b/alib2data/src/factory/XmlDataFactory.hpp index d859be15a843ee438b5b9f11d06414dbb3f3fc6a..165fb014047976a805ba69cec6271871d515d618 100644 --- a/alib2data/src/factory/XmlDataFactory.hpp +++ b/alib2data/src/factory/XmlDataFactory.hpp @@ -16,7 +16,6 @@ #include "../sax/SaxComposeInterface.h" #include "../XmlApi.hpp" #include "../exception/AlibException.h" -#include <chrono> namespace alib { @@ -88,9 +87,9 @@ public: if ( alib::xmlApi < exception::AlibException >::first ( context ) ) throw alib::xmlApi < exception::AlibException >::parse ( context ); - std::chrono::measurements::start ( "XML Parser", std::chrono::measurements::Type::INIT ); + // measurements::start ( "XML Parser", measurements::Type::INIT ); T res = alib::xmlApi < T >::parse ( context ); - std::chrono::measurements::end ( ); + // measurements::end ( ); if ( context != tokens.end ( ) ) throw exception::AlibException ( "Unexpeted tokens at the end of the xml" ); @@ -160,9 +159,9 @@ public: template < class T > static std::deque < sax::Token > toTokens ( const T & data ) { xmlApiOutputContext context; - std::chrono::measurements::start ( "XML Composer", std::chrono::measurements::Type::FINALIZE ); + // measurements::start ( "XML Composer", measurements::Type::FINALIZE ); alib::xmlApi < T >::compose ( context, data ); - std::chrono::measurements::end ( ); + // measurements::end ( ); return context; } diff --git a/alib2data/src/sax/SaxComposeInterface.cpp b/alib2data/src/sax/SaxComposeInterface.cpp index 2400cd45e277875a0ef1381a2a2d718a7e6a7c7a..71db7496bca46a47f076a67f582d327d88c44f85 100644 --- a/alib2data/src/sax/SaxComposeInterface.cpp +++ b/alib2data/src/sax/SaxComposeInterface.cpp @@ -13,7 +13,6 @@ #include <sstream> #include <deque> #include "ComposerException.h" -#include <chrono> namespace sax { @@ -52,7 +51,7 @@ void SaxComposeInterface::printStream(std::ostream& out, const std::deque<Token> } void SaxComposeInterface::xmlSAXUserPrint(xmlTextWriterPtr writer, const std::deque<Token>& in) { - std::chrono::measurements::start("Sax Composer", std::chrono::measurements::Type::FINALIZE); + // measurements::start("Sax Composer", measurements::Type::FINALIZE); xmlTextWriterStartDocument(writer, NULL, NULL, NULL); #ifdef DEBUG std::deque<Token> stack; @@ -95,7 +94,7 @@ void SaxComposeInterface::xmlSAXUserPrint(xmlTextWriterPtr writer, const std::de } } xmlTextWriterEndDocument(writer); - std::chrono::measurements::end(); + // measurements::end(); } } /* namespace sax */ diff --git a/alib2data/src/sax/SaxParseInterface.cpp b/alib2data/src/sax/SaxParseInterface.cpp index ff0cefeb297b6f0925fab5ba9208d6bcdac863bd..ecd9171937a8a7aed7f073b9700f95f4b004fd29 100644 --- a/alib2data/src/sax/SaxParseInterface.cpp +++ b/alib2data/src/sax/SaxParseInterface.cpp @@ -13,7 +13,6 @@ #include <iostream> #include <algorithm> #include "../exception/AlibException.h" -#include <chrono> namespace sax { @@ -55,7 +54,7 @@ void SaxParseInterface::parseStream(std::istream& in, std::deque<Token>& out) { int SaxParseInterface::xmlSAXUserParse(xmlTextReaderPtr reader, std::deque<Token>& out) { int ret = xmlTextReaderRead(reader); - std::chrono::measurements::start("Sax Parser", std::chrono::measurements::Type::INIT); + // measurements::start("Sax Parser", measurements::Type::INIT); while (ret == 1) { xmlChar* name = xmlTextReaderName(reader); xmlChar* value; @@ -92,7 +91,7 @@ int SaxParseInterface::xmlSAXUserParse(xmlTextReaderPtr reader, std::deque<Token ret = xmlTextReaderRead(reader); } - std::chrono::measurements::end(); + // measurements::end(); return ret; } diff --git a/alib2elgo/makefile.conf b/alib2elgo/makefile.conf index bebef90b538c8622ad3fc9f18bb24621076957b3..1c19a61981d3ba055782308c3d83d83a66bdc666 100644 --- a/alib2elgo/makefile.conf +++ b/alib2elgo/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2elgo TESTBIN:=alib2test -LINK_PATHS=../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2measure/Doxyfile b/alib2measure/Doxyfile new file mode 100644 index 0000000000000000000000000000000000000000..abb970f1ba44637794a5ec691028df4c681d39a3 --- /dev/null +++ b/alib2measure/Doxyfile @@ -0,0 +1,2280 @@ +# Doxyfile 1.8.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "alib2measure" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# the documentation. The maximum height of the logo should not exceed 55 pixels +# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo +# to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese- +# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi, +# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en, +# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, +# Turkish, Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a +# new page for each member. If set to NO, the documentation of a member will be +# part of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. +# +# Note For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO these classes will be included in the various overviews. This option has +# no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the +# todo list. This list is created by putting \todo commands in the +# documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the +# test list. This list is created by putting \test commands in the +# documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES the list +# will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. Do not use file names with spaces, bibtex cannot handle them. See +# also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO doxygen will only warn about wrong or incomplete parameter +# documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. + +INPUT = + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER ) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = . + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user- +# defined cascading style sheet that is included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefor more robust against future updates. +# Doxygen will copy the style sheet file to the output directory. For an example +# see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the stylesheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated ( +# YES) or that it should be included in the master .chm file ( NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated ( +# YES) or a normal table of contents ( NO) in the .chm file. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use <access key> + S +# (what the <access key> is depends on the OS and browser, but it is typically +# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down +# key> to jump into the search results window, the results can be navigated +# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel +# the search. The filter options can be selected when the cursor is inside the +# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys> +# to select a filter and <Enter> or <escape> to activate or cancel the filter +# option. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using Javascript. There +# are two flavours of web server based searching depending on the +# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for +# searching and an index file used by the script. When EXTERNAL_SEARCH is +# enabled the indexing and searching needs to be provided by external tools. See +# the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain the +# search results. +# +# Doxygen ships with an example indexer ( doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). +# +# See the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will return the search results when EXTERNAL_SEARCH is enabled. +# +# Doxygen ships with an example indexer ( doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Searching" for details. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. +# The default file is: searchdata.xml. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of +# to a relative location where the documentation can be found. The format is: +# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output. +# The default value is: YES. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. +# +# Note that when enabling USE_PDFLATEX this option is only used for generating +# bitmaps for formulas in the HTML output, but not in the Makefile that is +# written to the output directory. +# The default file is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate +# index for LaTeX. +# The default file is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used by the +# printer. +# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x +# 14 inches) and executive (7.25 x 10.5 inches). +# The default value is: a4. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names +# that should be included in the LaTeX output. To get the times font for +# instance you can specify +# EXTRA_PACKAGES=times +# If left blank no extra packages will be included. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the +# generated LaTeX document. The header should contain everything until the first +# chapter. If it is left blank doxygen will generate a standard header. See +# section "Doxygen usage" for information on how to let doxygen write the +# default header to a separate file. +# +# Note: Only use a user-defined header if you know what you are doing! The +# following commands have a special meaning inside the header: $title, +# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will +# replace them by respectively the title of the page, the current date and time, +# only the current date, the version number of doxygen, the project name (see +# PROJECT_NAME), or the project number (see PROJECT_NUMBER). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the +# generated LaTeX document. The footer should contain everything after the last +# chapter. If it is left blank doxygen will generate a standard footer. +# +# Note: Only use a user-defined footer if you know what you are doing! +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_FOOTER = + +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the LATEX_OUTPUT output +# directory. Note that the files will be copied as-is; there are no commands or +# markers available. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_FILES = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is +# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will +# contain links (just like the HTML output) instead of page references. This +# makes the output suitable for online browsing using a PDF viewer. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PDF_HYPERLINKS = YES + +# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES to get a +# higher quality PDF documentation. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode +# command to the generated LaTeX files. This will instruct LaTeX to keep running +# if errors occur, instead of asking the user for help. This option is also used +# when generating formulas in HTML. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BATCHMODE = NO + +# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the +# index chapters (such as File Index, Compound Index, etc.) in the output. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HIDE_INDICES = NO + +# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source +# code with syntax highlighting in the LaTeX output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. See +# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# The default value is: plain. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BIB_STYLE = plain + +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The +# RTF output is optimized for Word 97 and may not look too pretty with other RTF +# readers/editors. +# The default value is: NO. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: rtf. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will +# contain hyperlink fields. The RTF file will contain links (just like the HTML +# output) instead of page references. This makes the output suitable for online +# browsing using Word or some other Word compatible readers that support those +# fields. +# +# Note: WordPad (write) and others do not support links. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's config +# file, i.e. a series of assignments. You only have to provide replacements, +# missing definitions are set to their default value. +# +# See also section "Doxygen usage" for information on how to generate the +# default style sheet that doxygen normally uses. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an RTF document. Syntax is +# similar to doxygen's config file. A template extensions file can be generated +# using doxygen -e rtf extensionFile. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for +# classes and files. +# The default value is: NO. + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. A directory man3 will be created inside the directory specified by +# MAN_OUTPUT. +# The default directory is: man. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to the generated +# man pages. In case the manual section does not start with a number, the number +# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is +# optional. +# The default value is: .3. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without +# them the man command would be unable to find the correct page. +# The default value is: NO. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that +# captures the structure of the code including all documentation. +# The default value is: NO. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: xml. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a +# validating XML parser to check the syntax of the XML files. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify a XML DTD, which can be used by a +# validating XML parser to check the syntax of the XML files. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program +# listings (including syntax highlighting and cross-referencing information) to +# the XML output. Note that enabling this will significantly increase the size +# of the XML output. +# The default value is: YES. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files +# that can be used to generate PDF. +# The default value is: NO. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. +# The default directory is: docbook. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_OUTPUT = docbook + +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen +# Definitions (see http://autogen.sf.net) file that captures the structure of +# the code including all documentation. Note that this feature is still +# experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module +# file that captures the structure of the code including all documentation. +# +# Note that this feature is still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary +# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI +# output from the Perl module output. +# The default value is: NO. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely +# formatted so it can be parsed by a human reader. This is useful if you want to +# understand what is going on. On the other hand, if this tag is set to NO the +# size of the Perl module output will be much smaller and Perl will parse it +# just the same. +# The default value is: YES. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file are +# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful +# so different doxyrules.make files included by the same Makefile don't +# overwrite each other's variables. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all +# C-preprocessor directives found in the sources and include files. +# The default value is: YES. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names +# in the source code. If set to NO only conditional compilation will be +# performed. Macro expansion can be done in a controlled way by setting +# EXPAND_ONLY_PREDEF to YES. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then +# the macro expansion is limited to the macros specified with the PREDEFINED and +# EXPAND_AS_DEFINED tags. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES the includes files in the +# INCLUDE_PATH will be searched if a #include is found. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by the +# preprocessor. +# This tag requires that the tag SEARCH_INCLUDES is set to YES. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will be +# used. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that are +# defined before the preprocessor is started (similar to the -D option of e.g. +# gcc). The argument of the tag is a list of macros of the form: name or +# name=definition (no spaces). If the definition and the "=" are omitted, "=1" +# is assumed. To prevent a macro definition from being undefined via #undef or +# recursively expanded use the := operator instead of the = operator. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this +# tag can be used to specify a list of macro names that should be expanded. The +# macro definition that is found in the sources will be used. Use the PREDEFINED +# tag if you want to use a different macro definition that overrules the +# definition found in the source code. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will +# remove all refrences to function-like macros that are alone on a line, have an +# all uppercase name, and do not end with a semicolon. Such function macros are +# typically used for boiler-plate code, and will confuse the parser if not +# removed. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES tag can be used to specify one or more tag files. For each tag +# file the location of the external documentation should be added. The format of +# a tag file without this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where loc1 and loc2 can be relative or absolute paths or URLs. See the +# section "Linking to external documentation" for more information about the use +# of tag files. +# Note: Each tag file must have an unique name (where the name does NOT include +# the path). If a tag file is not located in the directory in which doxygen is +# run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create a +# tag file that is based on the input files it reads. See section "Linking to +# external documentation" for more information about the usage of tag files. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external class will be listed in the +# class index. If set to NO only the inherited external classes will be listed. +# The default value is: NO. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in +# the modules index. If set to NO, only the current project's groups will be +# listed. +# The default value is: YES. + +EXTERNAL_GROUPS = YES + +# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in +# the related pages index. If set to NO, only the current project's pages will +# be listed. +# The default value is: YES. + +EXTERNAL_PAGES = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of 'which perl'). +# The default file (with absolute path) is: /usr/bin/perl. + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram +# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to +# NO turns the diagrams off. Note that this option also works with HAVE_DOT +# disabled, but it is recommended to install and use dot, since it yields more +# powerful graphs. +# The default value is: YES. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see: +# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide inheritance +# and usage relations if the target is undocumented or is not a class. +# The default value is: YES. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. The other options in this section have no effect if this option is +# set to NO +# The default value is: NO. + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed +# to run in parallel. When set to 0 doxygen will base this on the number of +# processors available in the system. You can set it explicitly to a value +# larger than 0 to get control over the balance between CPU load and processing +# speed. +# Minimum value: 0, maximum value: 32, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NUM_THREADS = 0 + +# When you want a differently looking font n the dot files that doxygen +# generates you can specify the font name using DOT_FONTNAME. You need to make +# sure dot is able to find the font, which can be done by putting it in a +# standard location or by setting the DOTFONTPATH environment variable or by +# setting DOT_FONTPATH to the directory containing the font. +# The default value is: Helvetica. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of +# dot graphs. +# Minimum value: 4, maximum value: 24, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the default font as specified with +# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set +# the path where dot can find it using this tag. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTPATH = + +# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for +# each documented class showing the direct and indirect inheritance relations. +# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a +# graph for each documented class showing the direct and indirect implementation +# dependencies (inheritance, containment, and class references variables) of the +# class with other documented classes. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for +# groups, showing the direct groups dependencies. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LOOK = NO + +# If the UML_LOOK tag is enabled, the fields and methods are shown inside the +# class node. If there are many fields or methods and many nodes the graph may +# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the +# number of items for each type to make the size more manageable. Set this to 0 +# for no limit. Note that the threshold may be exceeded by 50% before the limit +# is enforced. So when you set the threshold to 10, up to 15 fields may appear, +# but if the number exceeds 15, the total amount of fields shown is limited to +# 10. +# Minimum value: 0, maximum value: 100, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LIMIT_NUM_FIELDS = 10 + +# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and +# collaboration graphs will show the relations between templates and their +# instances. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +TEMPLATE_RELATIONS = YES + +# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to +# YES then doxygen will generate a graph for each documented file showing the +# direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDE_GRAPH = YES + +# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are +# set to YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH tag is set to YES then doxygen will generate a call +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALLER_GRAPH = YES + +# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical +# hierarchy of all classes instead of a textual one. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the +# dependencies a directory has on other directories in a graphical way. The +# dependency relations are determined by the #include relations between the +# files in the directories. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. +# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order +# to make the SVG files visible in IE 9+ (other browsers do not have this +# requirement). +# Possible values are: png, jpg, gif and svg. +# The default value is: png. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_IMAGE_FORMAT = png + +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# +# Note that this requires a modern browser other than Internet Explorer. Tested +# and working are Firefox, Chrome, Safari, and Opera. +# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make +# the SVG files visible. Older versions of IE do not have SVG support. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +INTERACTIVE_SVG = NO + +# The DOT_PATH tag can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the \dotfile +# command). +# This tag requires that the tag HAVE_DOT is set to YES. + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes +# that will be shown in the graph. If the number of nodes in a graph becomes +# larger than this value, doxygen will truncate the graph, which is visualized +# by representing a node as a red box. Note that doxygen if the number of direct +# children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that +# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# Minimum value: 0, maximum value: 10000, default value: 50. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs +# generated by dot. A depth value of 3 means that only nodes reachable from the +# root by following a path via at most 3 edges will be shown. Nodes that lay +# further from the root node will be omitted. Note that setting this option to 1 +# or 2 may greatly reduce the computation time needed for large code bases. Also +# note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# Minimum value: 0, maximum value: 1000, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not seem +# to support this out of the box. +# +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) support +# this, this feature is disabled by default. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page +# explaining the meaning of the various boxes and arrows in the dot generated +# graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot +# files that are used to generate the various graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_CLEANUP = YES diff --git a/alib2measure/makefile b/alib2measure/makefile new file mode 100644 index 0000000000000000000000000000000000000000..73b514d3a815252ec17a16dec0446c6edfc78fdc --- /dev/null +++ b/alib2measure/makefile @@ -0,0 +1,290 @@ +SHELL:=/bin/bash +USE_RAMDISK ?= 0 +-include makefile.conf + +FULL_LIBRARY:=lib$(LIBRARY).so +define NEW_LINE + + +endef + +export NEW_LINE + +space := $(eval) $(eval) + +LDFLAGS_DEBUG:=-rdynamic -shared +TEST_LDFLAGS_DEBUG:=-Llib-debug $(addprefix -L, $(addsuffix lib-debug, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,. + +LDFLAGS_RELEASE:=-rdynamic -shared +TEST_LDFLAGS_RELEASE:=-Llib-release $(addprefix -L, $(addsuffix lib-release, $(LINK_PATHS))) -rdynamic -l$(LIBRARY) $(addprefix -l, $(LINK_LIBRARIES)) -lcppunit -Wl,-rpath,. + +OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp)) +TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp)) + +OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp))) +TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp)) + +.PHONY: all build-debug build-tests-debug clean-debug doc + +all: + @echo "What to do master?" + +obj%/makefile: makefile makefile.conf + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + echo "\ + SHELL:=/bin/bash$${NEW_LINE}\ + SRCDIR:=$${NEW_LINE}\ + $${NEW_LINE}\ + define NEW_LINE$${NEW_LINE}\ + $${NEW_LINE}\ + $${NEW_LINE}\ + endef$${NEW_LINE}\ + $${NEW_LINE}\ + export NEW_LINE$${NEW_LINE}\ + $${NEW_LINE}\ + CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC $(addprefix -I, $(INCLUDE_PATHS))$${NEW_LINE}\ + $${NEW_LINE}\ + SOURCES:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\ + DEPENDENCIES:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\ + OBJECTS:= \$$(patsubst %.d, %.o, \$$(DEPENDENCIES))$${NEW_LINE}\ + SOURCES_DIRS:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -mindepth 1 -type d)$${NEW_LINE}\ + OBJECTS_DIRS:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%, %/, \$$(SOURCES_DIRS))$${NEW_LINE}\ + OBJECTS_DIRS_MAKEFILES:= \$$(patsubst %, %makefile, \$$(OBJECTS_DIRS))$${NEW_LINE}\ + $${NEW_LINE}\ + .PHONY: all$${NEW_LINE}\ + .PRECIOUS: \$$(DEPENDECIES) \$$(OBJECTS_DIRS_MAKEFILES)$${NEW_LINE}\ + $${NEW_LINE}\ + all: \$$(OBJECTS_DIRS) \$$(OBJECTS)$${NEW_LINE}\ + $${NEW_LINE}\ + %.d: makefile$${NEW_LINE}\ + @echo \"\\$${NEW_LINE}\ + \$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -M \\$$\$$(CXXFLAGS) \$$(patsubst \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\")) makefile\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \" > \$$@$${NEW_LINE}\ + $${NEW_LINE}\ + %/makefile: makefile$${NEW_LINE}\ + mkdir -p \$$(dir \$$@)$${NEW_LINE}\ + cp makefile \$$@$${NEW_LINE}\ + $${NEW_LINE}\ + %/: FORCE | %/makefile$${NEW_LINE}\ + @accesstime=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\ + \$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ OBJECTS_BASE_DIR=\$$(OBJECTS_BASE_DIR) SOURCES_BASE_DIR=\$$(SOURCES_BASE_DIR) CXX_OTHER_FLAGS=\"\$$(CXX_OTHER_FLAGS)\" && \\$${NEW_LINE}\ + accesstime2=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\ + if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\$${NEW_LINE}\ + touch .; \\$${NEW_LINE}\ + fi$${NEW_LINE}\ + $${NEW_LINE}\ + FORCE:$${NEW_LINE}\ + $${NEW_LINE}\ + -include \$$(DEPENDENCIES)" > $@ + +test-obj%/makefile: makefile makefile.conf + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + echo "\ + SHELL:=/bin/bash$${NEW_LINE}\ + SRCDIR:=$${NEW_LINE}\ + $${NEW_LINE}\ + define NEW_LINE$${NEW_LINE}\ + $${NEW_LINE}\ + $${NEW_LINE}\ + endef$${NEW_LINE}\ + $${NEW_LINE}\ + export NEW_LINE$${NEW_LINE}\ + $${NEW_LINE}\ + CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC $(addprefix -I, $(INCLUDE_PATHS)) -I\$$(SOURCES_BASE_DIR)/../src/$${NEW_LINE}\ + $${NEW_LINE}\ + SOURCES:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\ + DEPENDENCIES:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\ + OBJECTS:= \$$(patsubst %.d, %.o, \$$(DEPENDENCIES))$${NEW_LINE}\ + SOURCES_DIRS:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -mindepth 1 -type d)$${NEW_LINE}\ + OBJECTS_DIRS:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%, %/, \$$(SOURCES_DIRS))$${NEW_LINE}\ + OBJECTS_DIRS_MAKEFILES:= \$$(patsubst %, %makefile, \$$(OBJECTS_DIRS))$${NEW_LINE}\ + $${NEW_LINE}\ + .PHONY: all$${NEW_LINE}\ + .PRECIOUS: \$$(DEPENDECIES) \$$(OBJECTS_DIRS_MAKEFILES)$${NEW_LINE}\ + $${NEW_LINE}\ + all: \$$(OBJECTS_DIRS) \$$(OBJECTS)$${NEW_LINE}\ + $${NEW_LINE}\ + %.d: makefile$${NEW_LINE}\ + @echo \"\\$${NEW_LINE}\ + \$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -M \\$$\$$(CXXFLAGS) \$$(patsubst \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\")) makefile\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\$$\$${NEW_LINE}\\$${NEW_LINE}\ + \" > \$$@$${NEW_LINE}\ + $${NEW_LINE}\ + %/makefile: makefile$${NEW_LINE}\ + mkdir -p \$$(dir \$$@)$${NEW_LINE}\ + cp makefile \$$@$${NEW_LINE}\ + $${NEW_LINE}\ + %/: FORCE | %/makefile$${NEW_LINE}\ + @accesstime=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\ + \$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ OBJECTS_BASE_DIR=\$$(OBJECTS_BASE_DIR) SOURCES_BASE_DIR=\$$(SOURCES_BASE_DIR) CXX_OTHER_FLAGS=\"\$$(CXX_OTHER_FLAGS)\" && \\$${NEW_LINE}\ + accesstime2=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\ + if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\$${NEW_LINE}\ + touch .; \\$${NEW_LINE}\ + fi$${NEW_LINE}\ + $${NEW_LINE}\ + FORCE:$${NEW_LINE}\ + $${NEW_LINE}\ + -include \$$(DEPENDENCIES)" > $@ + +debug: unit-test-debug + +release: unit-test-release + +clean: clean-debug clean-release + $(RM) -r doc + +test: unit-test-debug unit-test-release + + + +lib-debug/$(FULL_LIBRARY): $(OBJECTS_DEBUG) obj-debug/ + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG) + +lib-release/$(FULL_LIBRARY): $(OBJECTS_RELEASE) obj-release/ + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + $(CXX) $(OBJECTS_RELEASE) -o $@ $(LDFLAGS_RELEASE) + + + +obj-debug/: FORCE obj-debug/makefile + $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-debug) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG" + +obj-release/: FORCE obj-release/makefile + $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath obj-release) SOURCES_BASE_DIR=$(realpath src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE" + + + +$(OBJECTS_DEBUG): obj-debug/ + +$(OBJECTS_RELEASE): obj-release/ + + +build-debug: lib-debug/$(FULL_LIBRARY) + +build-release: lib-release/$(FULL_LIBRARY) + + + +test-bin-debug/$(TESTBIN): lib-debug/$(FULL_LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/ + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + $(CXX) $(TEST_OBJECTS_DEBUG) -o $@ $(TEST_LDFLAGS_DEBUG) + +test-bin-release/$(TESTBIN): lib-release/$(FULL_LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/ + if [ ! -w $(dir $@) ] && [ $(USE_RAMDISK) -eq 1 ]; then\ + ln -s /tmp/`date +'%s%N'`-$(dir $@) $(subst /, , $(dir $@)) 2>/dev/null;\ + fi;\ + if [ -L $(subst /, , $(dir $@)) ]; then\ + mkdir -p `readlink $(subst /, , $(dir $@))`;\ + else\ + mkdir -p $(dir $@);\ + fi + $(CXX) $(TEST_OBJECTS_RELEASE) -o $@ $(TEST_LDFLAGS_RELEASE) + + + +test-obj-debug/: FORCE test-obj-debug/makefile + $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-debug) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-g -O0 -DDEBUG" + +test-obj-release/: FORCE test-obj-release/makefile + $(MAKE) -C $@ OBJECTS_BASE_DIR=$(realpath test-obj-release) SOURCES_BASE_DIR=$(realpath test-src) CXX_OTHER_FLAGS="-O3 -DNDEBUG -DRELEASE" + + + +$(TEST_OBJECTS_DEBUG): test-obj-debug/ + +$(TEST_OBJECTS_RELEASE): test-obj-release/ + + + +build-tests-debug: test-bin-debug/$(TESTBIN) + +build-tests-release: test-bin-release/$(TESTBIN) + + + +unit-test-debug: build-tests-debug + LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-debug;,$(LINK_PATHS)))lib-debug" test-bin-debug/$(TESTBIN) + +unit-test-release: build-tests-release + LD_LIBRARY_PATH="$(subst $(space),;,$(addsuffix lib-release;,$(LINK_PATHS)))lib-release" test-bin-release/$(TESTBIN) + + + +clean-debug: + if [ -L obj-debug ]; then\ + rm -r `readlink obj-debug`;\ + fi + if [ -L lib-debug ]; then\ + rm -r `readlink lib-debug`;\ + fi + if [ -L test-obj-debug ]; then\ + rm -r `readlink test-obj-debug`;\ + fi + if [ -L test-bin-debug ]; then\ + rm -r `readlink test-bin-debug`;\ + fi + $(RM) -r *.o *.d lib-debug obj-debug test-bin-debug test-obj-debug CppUnitTestResults.xml + +clean-release: + if [ -L obj-release ]; then\ + rm -r `readlink obj-release`;\ + fi + if [ -L lib-release ]; then\ + rm -r `readlink lib-release`;\ + fi + if [ -L test-obj-release ]; then\ + rm -r `readlink test-obj-release`;\ + fi + if [ -L test-bin-release ]; then\ + rm -r `readlink test-bin-release`;\ + fi + $(RM) -r *.o *.d lib-release obj-release test-bin-release test-obj-release CppUnitTestResults.xml + + + +FORCE: + + + +doc: + doxygen + diff --git a/alib2measure/makefile.conf b/alib2measure/makefile.conf new file mode 100644 index 0000000000000000000000000000000000000000..9b0e3a71ece373c456883d8e611dd50d13906cfe --- /dev/null +++ b/alib2measure/makefile.conf @@ -0,0 +1,5 @@ +LIBRARY:=alib2measure +TESTBIN:=alib2test +LINK_PATHS=../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2measure/src/allocator/StealthAllocator.hpp b/alib2measure/src/allocator/StealthAllocator.hpp new file mode 100644 index 0000000000000000000000000000000000000000..8d570058ae81173ba8f1e76c2047b831f6455568 --- /dev/null +++ b/alib2measure/src/allocator/StealthAllocator.hpp @@ -0,0 +1,34 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef STEALTH_ALLOCATOR_HPP_ +#define STEALTH_ALLOCATOR_HPP_ + +#include <memory> +#include "../measurements/MeasurementNew.hpp" + +namespace measurements { + +template < typename T > +class stealth_allocator : public std::allocator < T > { +public: + using pointer = T *; + using size_type = size_t; + + pointer allocate ( size_type n ) { + return static_cast < pointer > ( operator new( n * sizeof ( T ), false ) ); + } + + void deallocate ( pointer ptr, size_type ) { + operator delete( ptr, false ); + } + + template < typename U > + struct rebind { using other = stealth_allocator < U >; }; + +}; + +} + +#endif /* STEALTH_ALLOCATOR_HPP_ */ diff --git a/alib2measure/src/allocator/StealthTypes.cpp b/alib2measure/src/allocator/StealthTypes.cpp new file mode 100644 index 0000000000000000000000000000000000000000..07d00967e37f157afbce5e1c46cb85303a18ec51 --- /dev/null +++ b/alib2measure/src/allocator/StealthTypes.cpp @@ -0,0 +1,16 @@ +/* + * Author: Radovan Cerveny + */ +#include "StealthTypes.hpp" + +namespace measurements { + +std::string to_string ( const stealth_string & ss ) { + return ss.c_str ( ); +} + +std::string to_string ( stealth_string & ss ) { + return ss.c_str ( ); +} + +} diff --git a/alib2measure/src/allocator/StealthTypes.hpp b/alib2measure/src/allocator/StealthTypes.hpp new file mode 100644 index 0000000000000000000000000000000000000000..c389401fae0108b5f4120a85c156c821b94baf04 --- /dev/null +++ b/alib2measure/src/allocator/StealthTypes.hpp @@ -0,0 +1,28 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef STEALTH_TYPES_HPP_ +#define STEALTH_TYPES_HPP_ + +#include <string> +#include <vector> +#include <map> +#include "StealthAllocator.hpp" + +namespace measurements { + +using stealth_string = std::basic_string < char, std::char_traits < char >, stealth_allocator < char > >; + +std::string to_string ( const stealth_string & ); +std::string to_string ( stealth_string & ); + +template < typename T > +using stealth_vector = std::vector < T, stealth_allocator < T > >; + +template < class Key, class T, class Compare = std::less < Key > > +using stealth_map = std::map < Key, T, Compare, stealth_allocator < std::pair < const Key, T > > >; + +} + +#endif /* STEALTH_TYPES_HPP_ */ diff --git a/alib2measure/src/debug/New.cpp b/alib2measure/src/debug/New.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c23d74728cf66ba2ca78263f09a019672ae5d4d0 --- /dev/null +++ b/alib2measure/src/debug/New.cpp @@ -0,0 +1,15 @@ +/* + * Author: Radovan Cerveny + */ + +#include <cstdlib> +#include <new> +#include "../measurements/MeasurementNew.hpp" + +void * operator new( std::size_t n ) { + return operator new( n, true ); +} + +void operator delete( void * ptr ) noexcept { + operator delete( ptr, true ); +} diff --git a/alib2measure/src/measure b/alib2measure/src/measure new file mode 100644 index 0000000000000000000000000000000000000000..dff12f84bda5a9732defbe453695c1c359980ae6 --- /dev/null +++ b/alib2measure/src/measure @@ -0,0 +1,10 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASURE_HPP_ +#define MEASURE_HPP_ + +#include "measurements/measurements.hpp" + +#endif /* MEASURE_HPP_ */ diff --git a/alib2measure/src/measurements/MeasurementEngine.cpp b/alib2measure/src/measurements/MeasurementEngine.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0615258d58e40ddff736a34e7971ffb0a47926c2 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementEngine.cpp @@ -0,0 +1,72 @@ +/* + * Author: Radovan Cerveny + */ + +#include "MeasurementEngine.hpp" + +namespace measurements { + +MeasurementEngine MeasurementEngine::INSTANCE; +bool MeasurementEngine::OPERATIONAL; + +MeasurementEngine::MeasurementEngine ( ) { + MeasurementEngine::OPERATIONAL = true; + + reset_measurements ( ); +} + +MeasurementEngine::~MeasurementEngine ( ) { + MeasurementEngine::OPERATIONAL = false; +} + +void MeasurementEngine::push_measurement_frame ( measurements::stealth_string frame_name, measurements::Type frame_type ) { + unsigned parent_idx = frame_idx_stack.back ( ); + + frames.emplace_back ( std::move ( frame_name ), frame_type, parent_idx ); + + unsigned current_idx = frames.size ( ) - 1; + + frames[parent_idx].sub_idxs.push_back ( current_idx ); + + frame_idx_stack.push_back ( current_idx ); + + TimeDataFrame::init ( current_idx, frames ); + MemoryDataFrame::init ( current_idx, frames ); + CounterDataFrame::init ( current_idx, frames ); +} + +void MeasurementEngine::pop_measurement_frame ( ) { + unsigned current_idx = frame_idx_stack.back ( ); + + if ( frames[current_idx].type == measurements::Type::ROOT ) + throw std::logic_error ( "no measurement started" ); + + frame_idx_stack.pop_back ( ); + + TimeDataFrame::update ( current_idx, frames ); + MemoryDataFrame::update ( current_idx, frames ); + CounterDataFrame::update ( current_idx, frames ); +} + +void MeasurementEngine::reset_measurements ( ) { + frames.clear ( ); + frame_idx_stack.clear ( ); + + frames.emplace_back ( "Root", measurements::Type::ROOT, 0 ); + frame_idx_stack.push_back ( 0 ); +} + +MeasurementResults MeasurementEngine::get_results ( ) const { + return MeasurementResults ( frames ); +} + +template < typename Hint > +void MeasurementEngine::hint ( Hint hint ) { + if ( ( frame_idx_stack.size ( ) == 0 ) || ( frames[frame_idx_stack.back ( )].type == measurements::Type::ROOT ) ) return; + + Hint::frame_type::hint ( frame_idx_stack.back ( ), frames, std::move ( hint ) ); +} + +template void MeasurementEngine::hint < MemoryHint > ( MemoryHint ); +template void MeasurementEngine::hint < CounterHint > ( CounterHint ); +} diff --git a/alib2measure/src/measurements/MeasurementEngine.hpp b/alib2measure/src/measurements/MeasurementEngine.hpp new file mode 100644 index 0000000000000000000000000000000000000000..721e1010609c661950e093c31a2ed7d24ea8bd2f --- /dev/null +++ b/alib2measure/src/measurements/MeasurementEngine.hpp @@ -0,0 +1,37 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENT_ENGINE_HPP_ +#define MEASUREMENT_ENGINE_HPP_ + +#include "MeasurementTypes.hpp" +#include "MeasurementFrame.hpp" +#include "MeasurementResults.hpp" + +namespace measurements { + +class MeasurementEngine { + measurements::stealth_vector < unsigned > frame_idx_stack; + measurements::stealth_vector < MeasurementFrame > frames; + + MeasurementEngine ( ); + +public: + void push_measurement_frame ( measurements::stealth_string, measurements::Type ); + void pop_measurement_frame ( ); + void reset_measurements ( ); + MeasurementResults get_results ( ) const; + + template < typename Hint > + void hint ( Hint ); + + ~MeasurementEngine ( ); + + static MeasurementEngine INSTANCE; + static bool OPERATIONAL; +}; + +} + +#endif /* MEASUREMENT_ENGINE_HPP_ */ diff --git a/alib2measure/src/measurements/MeasurementFrame.cpp b/alib2measure/src/measurements/MeasurementFrame.cpp new file mode 100644 index 0000000000000000000000000000000000000000..31a8d9b1a43b5c84b7d046cb5d61a76aa7d64242 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementFrame.cpp @@ -0,0 +1,50 @@ +/* + * Author: Radovan Cerveny + */ + +#include <sstream> +#include "MeasurementFrame.hpp" + +namespace measurements { + +MeasurementFrame::MeasurementFrame ( measurements::stealth_string name, measurements::Type type, unsigned parent_idx ) : name ( std::move ( name ) ), type ( type ), parent_idx ( parent_idx ), time ( ), memory ( ) { +} + +void MeasurementFrame::xml_tokens ( std::deque < sax::Token > & tokens, unsigned idx, const measurements::stealth_vector < MeasurementFrame > & frames ) { + const MeasurementFrame & frame = frames[idx]; + + tokens.emplace_back ( "MeasurementFrame", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( "Name", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( measurements::to_string ( frame.name ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Name", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "Type", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( measurements::to_string ( frame.type ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Type", sax::Token::TokenType::END_ELEMENT ); + + if ( frame.type != measurements::Type::ROOT ) { + TimeDataFrame::xml_tokens ( tokens, idx, frames ); + MemoryDataFrame::xml_tokens ( tokens, idx, frames ); + CounterDataFrame::xml_tokens ( tokens, idx, frames ); + } + + tokens.emplace_back ( "SubFrames", sax::Token::TokenType::START_ELEMENT ); + + for ( unsigned sub_idx : frame.sub_idxs ) + xml_tokens ( tokens, sub_idx, frames ); + + tokens.emplace_back ( "SubFrames", sax::Token::TokenType::END_ELEMENT ); + + tokens.emplace_back ( "MeasurementFrame", sax::Token::TokenType::END_ELEMENT ); +} + +std::ostream & operator <<( std::ostream & os, const MeasurementFrame & frame ) { + + std::stringstream ss; + + ss << "(TIME: " << frame.time << "), (MEM: " << frame.memory << "), (COUNTER: " << frame.counter << ")"; + + os << std::make_tuple ( frame.name, frame.type, frame.parent_idx, frame.sub_idxs, ss.str ( ) ); + return os; +} + +} diff --git a/alib2measure/src/measurements/MeasurementFrame.hpp b/alib2measure/src/measurements/MeasurementFrame.hpp new file mode 100644 index 0000000000000000000000000000000000000000..02d423dc24dee54d6388626004c3aadcf260a151 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementFrame.hpp @@ -0,0 +1,37 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENT_FRAME_HPP_ +#define MEASUREMENT_FRAME_HPP_ + +#include <chrono> +#include <sstream> +#include <deque> +#include "sax/Token.h" +#include "MeasurementTypes.hpp" +#include "frames/TimeDataFrame.hpp" +#include "frames/MemoryDataFrame.hpp" +#include "frames/CounterDataFrame.hpp" + +namespace measurements { + +struct MeasurementFrame { + measurements::stealth_string name; + measurements::Type type; + unsigned parent_idx; + + measurements::stealth_vector < unsigned > sub_idxs; + + TimeDataFrame time; + MemoryDataFrame memory; + CounterDataFrame counter; + + MeasurementFrame ( measurements::stealth_string, measurements::Type, unsigned ); + static void xml_tokens ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & ); +}; + +std::ostream & operator <<( std::ostream &, const MeasurementFrame & ); +} + +#endif /* MEASUREMENT_FRAME_HPP_ */ diff --git a/alib2measure/src/measurements/MeasurementNew.cpp b/alib2measure/src/measurements/MeasurementNew.cpp new file mode 100644 index 0000000000000000000000000000000000000000..5872d205b939afcb1363ee6a2a386197b8f2d052 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementNew.cpp @@ -0,0 +1,52 @@ +/* + * Author: Radovan Cerveny + */ + +#include <cstdlib> +#include <new> +#include "MeasurementNew.hpp" +#include "measurements.hpp" + +void * operator new( std::size_t n, bool measure ) { + void * ptr = nullptr; + + for ( ; ; ) { + // allocate little more for extra info + ptr = std::malloc ( n + sizeof ( std::size_t ) ); + + if ( ptr != nullptr ) { + // store requested size before the block + std::size_t * sptr = static_cast < std::size_t * > ( ptr ); + * sptr = n; + sptr++; + + // send it to the engine if it does not come from stealth allocation + if ( measure ) + measurements::hint ( measurements::MemoryHint { measurements::MemoryHint::Type::NEW, n } ); + + return static_cast < void * > ( sptr ); + } + + auto cur_handler = std::set_new_handler ( 0 ); + std::set_new_handler ( cur_handler ); + + if ( cur_handler != nullptr ) + cur_handler ( ); + else + throw std::bad_alloc ( ); + } +} + +void operator delete( void * ptr, bool measure ) noexcept { + if ( ptr == nullptr ) return; + + std::size_t * sptr = static_cast < std::size_t * > ( ptr ); + + sptr--; + + // read the block size and send it to the engine if it does not come from stealth allocation + if ( measure ) + measurements::hint ( measurements::MemoryHint { measurements::MemoryHint::Type::DELETE, * sptr } ); + + std::free ( sptr ); +} diff --git a/alib2measure/src/measurements/MeasurementNew.hpp b/alib2measure/src/measurements/MeasurementNew.hpp new file mode 100644 index 0000000000000000000000000000000000000000..aa2437d821861adc54462323c0a9aa884ebd56a2 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementNew.hpp @@ -0,0 +1,12 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENT_NEW_HPP_ +#define MEASUREMENT_NEW_HPP_ + +void * operator new( std::size_t n, bool measure ); + +void operator delete( void * ptr, bool measure ) noexcept; + +#endif /* MEASUREMENT_NEW_HPP_ */ diff --git a/alib2measure/src/measurements/MeasurementResults.cpp b/alib2measure/src/measurements/MeasurementResults.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e767ad3cd951e1e539618e682677c4e690bd6b12 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementResults.cpp @@ -0,0 +1,138 @@ +/* + * Author: Radovan Cerveny + */ +#include "MeasurementResults.hpp" + +namespace measurements { + +MeasurementResults::MeasurementResults ( ) { +} + +MeasurementResults::MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & frames ) : frames ( frames ) { +} + +std::deque < sax::Token > MeasurementResults::xml_tokens ( ) const { + std::deque < sax::Token > tokens; + + tokens.emplace_back ( "MeasurementResults", sax::Token::TokenType::START_ELEMENT ); + + MeasurementFrame::xml_tokens ( tokens, 0, frames ); + + tokens.emplace_back ( "MeasurementResults", sax::Token::TokenType::END_ELEMENT ); + return tokens; +} + +void MeasurementResults::print_as_list ( std::ostream & os ) const { + print_as_list ( os, 0 ); +} + +void MeasurementResults::print_as_list ( std::ostream & os, unsigned idx ) const { + const MeasurementFrame & frame = frames[idx]; + + if ( frame.type != measurements::Type::ROOT ) { + os << frame; + + if ( idx != frames.size ( ) - 1 ) + os << ", "; + } + + for ( unsigned sub_idx : frame.sub_idxs ) + print_as_list ( os, sub_idx ); +} + +void MeasurementResults::print_as_tree ( std::ostream & os ) const { + std::string prefix; + + print_as_tree ( os, 0, prefix, false ); +} + +void MeasurementResults::print_as_tree ( std::ostream & os, unsigned idx, std::string & prefix, bool last_in_parent ) const { + const MeasurementFrame & frame = frames[idx]; + + if ( frame.type == measurements::Type::ROOT ) { + if ( frame.sub_idxs.size ( ) ) { + prefix = "|-"; + + last_in_parent = false; + + for ( unsigned sub_idx : frame.sub_idxs ) { + + prefix[prefix.size ( ) - 2] = '|'; + prefix[prefix.size ( ) - 1] = '-'; + + if ( sub_idx == frame.sub_idxs.front ( ) ) + prefix[prefix.size ( ) - 2] = '+'; + + if ( sub_idx == frame.sub_idxs.back ( ) ) { + prefix[prefix.size ( ) - 2] = '\\'; + last_in_parent = true; + } + + print_as_tree ( os, sub_idx, prefix, last_in_parent ); + } + } + } else { + if ( frame.sub_idxs.size ( ) ) { + prefix += '+'; + os << prefix << frame << std::endl; + prefix += '-'; + + prefix[prefix.size ( ) - 3] = ' '; + + if ( last_in_parent ) + prefix[prefix.size ( ) - 4] = ' '; + else + prefix[prefix.size ( ) - 4] = '|'; + + last_in_parent = false; + + for ( unsigned sub_idx : frame.sub_idxs ) { + + prefix[prefix.size ( ) - 2] = '|'; + prefix[prefix.size ( ) - 1] = '-'; + + if ( sub_idx == frame.sub_idxs.back ( ) ) { + prefix[prefix.size ( ) - 2] = '\\'; + last_in_parent = true; + } + + print_as_tree ( os, sub_idx, prefix, last_in_parent ); + } + + prefix.erase ( prefix.size ( ) - 2 ); + + } else { + os << prefix << frame << std::endl; + } + } +} + +const int MeasurementXalloc::FORMAT = std::ios::xalloc ( ); + +std::ostream & operator <<( std::ostream & os, const MeasurementResults & mr ) { + MeasurementFormat mf = MeasurementFormat::XML; + + int os_format = os.iword ( MeasurementXalloc::FORMAT ); + + // if format was set, use that format, otherwise default to XML + if ( os_format ) + mf = static_cast < MeasurementFormat > ( os_format ); + + switch ( mf ) { + case MeasurementFormat::LIST: + mr.print_as_list ( os ); + break; + + case MeasurementFormat::TREE: + mr.print_as_tree ( os ); + break; + + case MeasurementFormat::XML: + sax::SaxComposeInterface::printStream ( os, mr.xml_tokens ( ) ); + break; + } + + return os; +} + +} diff --git a/alib2measure/src/measurements/MeasurementResults.hpp b/alib2measure/src/measurements/MeasurementResults.hpp new file mode 100644 index 0000000000000000000000000000000000000000..699e1e019b266c9c6855a5ff739b7ec06b256803 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementResults.hpp @@ -0,0 +1,49 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENT_RESULTS_HPP_ +#define MEASUREMENT_RESULTS_HPP_ + +#include <ostream> +#include "sax/SaxComposeInterface.h" +#include "MeasurementTypes.hpp" +#include "MeasurementFrame.hpp" + +namespace measurements { + +enum class MeasurementFormat { + LIST = 1, TREE = 2, XML = 4 +}; + +struct MeasurementXalloc { + static const int FORMAT; +}; + +struct MeasurementResults { + measurements::stealth_vector < MeasurementFrame > frames; + + MeasurementResults ( ); + MeasurementResults ( const measurements::stealth_vector < MeasurementFrame > & ); + + void print_as_list ( std::ostream & ) const; + void print_as_tree ( std::ostream & ) const; + + std::deque < sax::Token > xml_tokens ( ) const; + +private: + void print_as_list ( std::ostream &, unsigned ) const; + void print_as_tree ( std::ostream &, unsigned, std::string &, bool ) const; +}; + +std::ostream & operator <<( std::ostream &, const MeasurementResults & ); + +template < typename _CharT, typename _Traits > +inline std::basic_ostream < _CharT, _Traits > & operator <<( std::basic_ostream < _CharT, _Traits > & x, MeasurementFormat f ) { + x.iword ( MeasurementXalloc::FORMAT ) = static_cast < int > ( f ); + return x; +} + +} + +#endif /* MEASUREMENT_RESULTS_HPP_ */ diff --git a/alib2measure/src/measurements/MeasurementTypes.cpp b/alib2measure/src/measurements/MeasurementTypes.cpp new file mode 100644 index 0000000000000000000000000000000000000000..47f29c903803ce4d624c05d464276a535e6e36e4 --- /dev/null +++ b/alib2measure/src/measurements/MeasurementTypes.cpp @@ -0,0 +1,37 @@ +/* + * Author: Radovan Cerveny + */ +#include "MeasurementTypes.hpp" + +namespace measurements { + +std::string to_string ( Type t ) { + switch ( t ) { + case Type::ROOT: + return "ROOT"; + + case Type::OVERALL: + return "OVERALL"; + + case Type::INIT: + return "INIT"; + + case Type::FINALIZE: + return "FINALIZE"; + + case Type::MAIN: + return "MAIN"; + + case Type::AUXILIARY: + return "AUXILIARY"; + } + + return "ERR"; +} + +std::ostream & operator <<( std::ostream & os, Type t ) { + os << to_string ( t ); + return os; +} + +} diff --git a/alib2measure/src/measurements/MeasurementTypes.hpp b/alib2measure/src/measurements/MeasurementTypes.hpp new file mode 100644 index 0000000000000000000000000000000000000000..38e3ed64e2930b8bec5f490cd703eb55d6427aad --- /dev/null +++ b/alib2measure/src/measurements/MeasurementTypes.hpp @@ -0,0 +1,25 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENT_TYPES_HPP_ +#define MEASUREMENT_TYPES_HPP_ + +#include <memory> +#include <vector> +#include <map> +#include "MeasurementNew.hpp" +#include "../allocator/StealthTypes.hpp" + +namespace measurements { + +enum class Type : unsigned { + ROOT = 1, OVERALL = 2, INIT = 4, FINALIZE = 8, MAIN = 16, AUXILIARY = 32 +}; + +std::string to_string ( Type ); +std::ostream & operator <<( std::ostream &, Type ); + +} + +#endif /* MEASUREMENT_TYPES_HPP_ */ diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.cpp b/alib2measure/src/measurements/frames/CounterDataFrame.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9355be32e748d14842b7858c4aeb69489fbcb001 --- /dev/null +++ b/alib2measure/src/measurements/frames/CounterDataFrame.cpp @@ -0,0 +1,118 @@ +/* + * Author: Radovan Cerveny + */ + +#include "../MeasurementFrame.hpp" + +namespace measurements { + +void CounterDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) { + MeasurementFrame & current_frame = frames[frame_idx]; + MeasurementFrame & parent_frame = frames[current_frame.parent_idx]; + + if ( parent_frame.type != measurements::Type::ROOT ) + current_frame.counter.counters = parent_frame.counter.counters; +} + +void CounterDataFrame::update ( unsigned, measurements::stealth_vector < MeasurementFrame > & ) { +} + +void CounterDataFrame::hint ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames, CounterHint hint ) { + + CounterHint::value_type delta; + + switch ( hint.type ) { + case CounterHint::Type::ADD: + delta = hint.value; + break; + + case CounterHint::Type::INC: + delta = 1; + break; + + case CounterHint::Type::SUB: + delta = -hint.value; + break; + + case CounterHint::Type::DEC: + delta = -1; + break; + } + + frames[frame_idx].counter.real_counters[hint.name] += delta; + + unsigned cur_idx = frame_idx; + + for ( ; ; ) { + MeasurementFrame & current_frame = frames[cur_idx]; + + if ( current_frame.type == measurements::Type::ROOT ) break; + + current_frame.counter.counters[hint.name] += delta; + + cur_idx = current_frame.parent_idx; + } +} + +void CounterDataFrame::xml_tokens ( std::deque < sax::Token > & tokens, unsigned idx, const measurements::stealth_vector < MeasurementFrame > & frames ) { + const CounterDataFrame & cdf = frames[idx].counter; + + tokens.emplace_back ( "CounterData", sax::Token::TokenType::START_ELEMENT ); + + tokens.emplace_back ( "Counters", sax::Token::TokenType::START_ELEMENT ); + + for ( const auto & elem : cdf.counters ) { + tokens.emplace_back ( "Counter", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( "Name", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Name", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "Value", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( elem.second ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Value", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "Counter", sax::Token::TokenType::END_ELEMENT ); + } + + tokens.emplace_back ( "Counters", sax::Token::TokenType::END_ELEMENT ); + + tokens.emplace_back ( "RealCounters", sax::Token::TokenType::START_ELEMENT ); + + for ( const auto & elem : cdf.real_counters ) { + tokens.emplace_back ( "Counter", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( "Name", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( measurements::to_string ( elem.first ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Name", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "Value", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( elem.second ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Value", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "Counter", sax::Token::TokenType::END_ELEMENT ); + } + + tokens.emplace_back ( "RealCounters", sax::Token::TokenType::END_ELEMENT ); + + tokens.emplace_back ( "CounterData", sax::Token::TokenType::END_ELEMENT ); +} + +std::ostream & operator <<( std::ostream & os, const CounterDataFrame & cdf ) { + + os << "("; + + for ( auto it = cdf.counters.begin ( ); it != cdf.counters.end ( ); ++it ) { + os << it->first << " : " << it->second; + + if ( it != cdf.counters.end ( ) ) os << ", "; + } + + os << "), ("; + + for ( auto it = cdf.real_counters.begin ( ); it != cdf.real_counters.end ( ); ++it ) { + os << it->first << " : " << it->second; + + if ( it != cdf.real_counters.end ( ) ) os << ", "; + } + + os << ")"; + + return os; +} + +} diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.hpp b/alib2measure/src/measurements/frames/CounterDataFrame.hpp new file mode 100644 index 0000000000000000000000000000000000000000..f2e3bf3b48afc1e24bd3093f0030ffbdd3d351ac --- /dev/null +++ b/alib2measure/src/measurements/frames/CounterDataFrame.hpp @@ -0,0 +1,42 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef COUNTER_DATA_FRAME_HPP_ +#define COUNTER_DATA_FRAME_HPP_ + +#include <deque> +#include "sax/Token.h" +#include "../MeasurementTypes.hpp" + +namespace measurements { + +struct MeasurementFrame; +struct CounterDataFrame; + +struct CounterHint { + using frame_type = CounterDataFrame; + using value_type = long long int; + enum class Type { + ADD, SUB, INC, DEC + }; + + measurements::stealth_string name; + Type type; + value_type value; +}; + +struct CounterDataFrame { + measurements::stealth_map < measurements::stealth_string, CounterHint::value_type > counters; + measurements::stealth_map < measurements::stealth_string, CounterHint::value_type > real_counters; + + static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, CounterHint ); + static void xml_tokens ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & ); +}; + +std::ostream & operator <<( std::ostream &, const CounterDataFrame & ); +} + +#endif /* COUNTER_DATA_FRAME_HPP_ */ diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.cpp b/alib2measure/src/measurements/frames/MemoryDataFrame.cpp new file mode 100644 index 0000000000000000000000000000000000000000..37fe201ce144ac6348c1eb4aff1af5872b82975b --- /dev/null +++ b/alib2measure/src/measurements/frames/MemoryDataFrame.cpp @@ -0,0 +1,74 @@ +/* + * Author: Radovan Cerveny + */ + +#include "../MeasurementFrame.hpp" + +namespace measurements { + +void MemoryDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) { + MeasurementFrame & current_frame = frames[frame_idx]; + MeasurementFrame & parent_frame = frames[current_frame.parent_idx]; + + if ( parent_frame.type != measurements::Type::ROOT ) { + current_frame.memory.start_heap_usage = parent_frame.memory.current_heap_usage; + current_frame.memory.current_heap_usage = parent_frame.memory.current_heap_usage; + current_frame.memory.high_watermark = parent_frame.memory.current_heap_usage; + } +} + +void MemoryDataFrame::update ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) { + MeasurementFrame & current_frame = frames[frame_idx]; + MeasurementFrame & parent_frame = frames[current_frame.parent_idx]; + + current_frame.memory.end_heap_usage = current_frame.memory.current_heap_usage; + + // if we end up with more memory from children, adjust watermark + if ( current_frame.memory.current_heap_usage > current_frame.memory.high_watermark ) + current_frame.memory.high_watermark = current_frame.memory.current_heap_usage; + + if ( parent_frame.type != measurements::Type::ROOT ) + parent_frame.memory.current_heap_usage = current_frame.memory.current_heap_usage; +} + +void MemoryDataFrame::hint ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames, MemoryHint hint ) { + + MeasurementFrame & current_frame = frames[frame_idx]; + + switch ( hint.type ) { + case MemoryHint::Type::NEW: + current_frame.memory.current_heap_usage += hint.size; + + if ( current_frame.memory.current_heap_usage > current_frame.memory.high_watermark ) + current_frame.memory.high_watermark = current_frame.memory.current_heap_usage; + + break; + + case MemoryHint::Type::DELETE: + current_frame.memory.current_heap_usage -= hint.size; + break; + } +} + +void MemoryDataFrame::xml_tokens ( std::deque < sax::Token > & tokens, unsigned idx, const measurements::stealth_vector < MeasurementFrame > & frames ) { + const MemoryDataFrame & frame = frames[idx].memory; + + tokens.emplace_back ( "MemoryData", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( "StartHeapUsage", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( frame.start_heap_usage ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "StartHeapUsage", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "EndHeapUsage", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( frame.end_heap_usage ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "EndHeapUsage", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "HighWatermark", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( frame.high_watermark ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "HighWatermark", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "MemoryData", sax::Token::TokenType::END_ELEMENT ); +} + +std::ostream & operator <<( std::ostream & os, const MemoryDataFrame & mdf ) { + os << mdf.start_heap_usage << "shu, " << mdf.end_heap_usage << "ehu, " << mdf.high_watermark << "hw"; + return os; +} + +} diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.hpp b/alib2measure/src/measurements/frames/MemoryDataFrame.hpp new file mode 100644 index 0000000000000000000000000000000000000000..91f45516ae10f42b8aa566117316feea1fd0e00e --- /dev/null +++ b/alib2measure/src/measurements/frames/MemoryDataFrame.hpp @@ -0,0 +1,43 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEMORY_DATA_FRAME_HPP_ +#define MEMORY_DATA_FRAME_HPP_ + +#include <deque> +#include "sax/Token.h" +#include "../MeasurementTypes.hpp" + +namespace measurements { + +struct MeasurementFrame; +struct MemoryDataFrame; + +struct MemoryHint { + using frame_type = MemoryDataFrame; + enum class Type { + NEW, DELETE + }; + + Type type; + size_t size; +}; + +struct MemoryDataFrame { + size_t start_heap_usage; + size_t end_heap_usage; + size_t high_watermark; + + size_t current_heap_usage; + + static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void hint ( unsigned, measurements::stealth_vector < MeasurementFrame > &, MemoryHint ); + static void xml_tokens ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & ); +}; + +std::ostream & operator <<( std::ostream &, const MemoryDataFrame & ); +} + +#endif /* MEMORY_DATA_FRAME_HPP_ */ diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.cpp b/alib2measure/src/measurements/frames/TimeDataFrame.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ea46d9758237be64af9b9251d87d23113d5b838d --- /dev/null +++ b/alib2measure/src/measurements/frames/TimeDataFrame.cpp @@ -0,0 +1,52 @@ +/* + * Author: Radovan Cerveny + */ + +#include <sstream> +#include "../MeasurementFrame.hpp" + +using namespace std::chrono; + +namespace measurements { + +void TimeDataFrame::init ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) { + MeasurementFrame & current_frame = frames[frame_idx]; + + current_frame.time.start = high_resolution_clock::now ( ); +} + +void TimeDataFrame::update ( unsigned frame_idx, measurements::stealth_vector < MeasurementFrame > & frames ) { + MeasurementFrame & current_frame = frames[frame_idx]; + + current_frame.time.duration = duration_cast < microseconds > ( high_resolution_clock::now ( ) - current_frame.time.start ); + current_frame.time.real_duration += current_frame.time.duration; + + MeasurementFrame & parent_frame = frames[current_frame.parent_idx]; + + parent_frame.time.real_duration -= current_frame.time.duration; +} + +void TimeDataFrame::xml_tokens ( std::deque < sax::Token > & tokens, unsigned idx, const measurements::stealth_vector < MeasurementFrame > & frames ) { + const TimeDataFrame & frame = frames[idx].time; + + tokens.emplace_back ( "TimeData", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( "Duration", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( frame.duration.count ( ) ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "Duration", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "RealDuration", sax::Token::TokenType::START_ELEMENT ); + tokens.emplace_back ( std::to_string ( frame.real_duration.count ( ) ), sax::Token::TokenType::CHARACTER ); + tokens.emplace_back ( "RealDuration", sax::Token::TokenType::END_ELEMENT ); + tokens.emplace_back ( "TimeData", sax::Token::TokenType::END_ELEMENT ); +} + +std::ostream & operator <<( std::ostream & os, const TimeDataFrame & tdf ) { + os << tdf.duration << ", " << tdf.real_duration; + return os; +} + +std::ostream & operator <<( std::ostream & os, const std::chrono::microseconds & ms ) { + os << ms.count ( ) << "ms"; + return os; +} + +} diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.hpp b/alib2measure/src/measurements/frames/TimeDataFrame.hpp new file mode 100644 index 0000000000000000000000000000000000000000..5213c1a10db490f307e5d1fdc843487d1d7b7c1a --- /dev/null +++ b/alib2measure/src/measurements/frames/TimeDataFrame.hpp @@ -0,0 +1,32 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef TIME_DATA_FRAME_HPP_ +#define TIME_DATA_FRAME_HPP_ + +#include <chrono> +#include <deque> +#include "sax/Token.h" +#include "../MeasurementTypes.hpp" + +namespace measurements { + +struct MeasurementFrame; + +struct TimeDataFrame { + std::chrono::time_point < std::chrono::high_resolution_clock > start; + + std::chrono::microseconds duration; + std::chrono::microseconds real_duration; + + static void init ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void update ( unsigned, measurements::stealth_vector < MeasurementFrame > & ); + static void xml_tokens ( std::deque < sax::Token > &, unsigned, const measurements::stealth_vector < MeasurementFrame > & ); +}; + +std::ostream & operator <<( std::ostream &, const std::chrono::microseconds & ); +std::ostream & operator <<( std::ostream &, const TimeDataFrame & ); +} + +#endif /* TIME_DATA_FRAME_HPP_ */ diff --git a/alib2measure/src/measurements/measurements.cpp b/alib2measure/src/measurements/measurements.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8c3ca967ee055fcbe042807d156edbdcfb0e629b --- /dev/null +++ b/alib2measure/src/measurements/measurements.cpp @@ -0,0 +1,39 @@ +/* + * Author: Radovan Cerveny + */ + +#include "measurements.hpp" + +namespace measurements { + +void start ( measurements::stealth_string name, measurements::Type type ) { + if ( MeasurementEngine::OPERATIONAL ) + MeasurementEngine::INSTANCE.push_measurement_frame ( std::move ( name ), type ); +} + +void end ( ) { + if ( MeasurementEngine::OPERATIONAL ) + MeasurementEngine::INSTANCE.pop_measurement_frame ( ); +} + +void reset ( ) { + if ( MeasurementEngine::OPERATIONAL ) + MeasurementEngine::INSTANCE.reset_measurements ( ); +} + +MeasurementResults results ( ) { + if ( MeasurementEngine::OPERATIONAL ) + return MeasurementEngine::INSTANCE.get_results ( ); + else + return MeasurementResults ( ); +} + +template < typename Hint > +void hint ( Hint hint ) { + if ( MeasurementEngine::OPERATIONAL ) + MeasurementEngine::INSTANCE.hint ( std::move ( hint ) ); +} + +template void hint < MemoryHint > ( MemoryHint ); +template void hint < CounterHint > ( CounterHint ); +} diff --git a/alib2measure/src/measurements/measurements.hpp b/alib2measure/src/measurements/measurements.hpp new file mode 100644 index 0000000000000000000000000000000000000000..e2de4514287d6ec8424d132d2c280cc8be26e676 --- /dev/null +++ b/alib2measure/src/measurements/measurements.hpp @@ -0,0 +1,24 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef MEASUREMENTS_HPP_ +#define MEASUREMENTS_HPP_ + +#include "MeasurementEngine.hpp" + +namespace measurements { + +void start ( measurements::stealth_string name, measurements::Type type ); + +void end ( ); + +void reset ( ); + +MeasurementResults results ( ); + +template < typename Hint > +void hint ( Hint hint ); +} + +#endif /* MEASUREMENTS_HPP_ */ diff --git a/alib2measure/test-src/main.cpp b/alib2measure/test-src/main.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f2bf8db94da8d4ee7095ac748957aec1fe8c81c2 --- /dev/null +++ b/alib2measure/test-src/main.cpp @@ -0,0 +1,164 @@ +#include <tclap/CmdLine.h> + +#include <cppunit/CompilerOutputter.h> +#include <cppunit/extensions/TestFactoryRegistry.h> +#include <cppunit/ui/text/TestRunner.h> +#include <cppunit/TestResultCollector.h> +#include <cppunit/TestResult.h> +#include <cppunit/XmlOutputter.h> + +#include <cppunit/Test.h> +#include <cppunit/TestFailure.h> +#include <cppunit/portability/Stream.h> +#include <cppunit/TestListener.h> +#include <cppunit/SourceLine.h> +#include <cppunit/Exception.h> + +#include <exception/AlibException.h> + +CPPUNIT_NS_BEGIN + +class CPPUNIT_API TestProgressListener : public TestListener +{ +public: + TestProgressListener(); + + virtual ~TestProgressListener(); + + void startTest( Test *test ); + + void addFailure( const TestFailure &failure ); + + void endTest( Test *test ); + + int getResult() const; + + void printResults() const; + +private: + TestProgressListener( const TestProgressListener © ); + + void operator =( const TestProgressListener © ); + +private: + int m_Failures; + int m_Tests; + int m_Assertions; + bool m_lastTestFailed; +}; + +TestProgressListener::TestProgressListener() : m_Failures( 0 ), m_Tests(0), m_Assertions(0), m_lastTestFailed( false ) +{ +} + +TestProgressListener::~TestProgressListener() +{ +} + +void TestProgressListener::startTest( Test * test ) +{ + stdCOut() << test->getName() << ":" << "\n"; + stdCOut().flush(); + + m_lastTestFailed = false; + m_Tests++; +} + +void TestProgressListener::addFailure( const TestFailure &failure ) +{ + stdCOut() << (failure.isError() ? "error" : "assertion") << " : " << failure.failedTestName() << " : " << failure.sourceLine().lineNumber() << "\n"; + stdCOut() << "Exception " << failure.thrownException()->message().details(); + + m_lastTestFailed = true; + if(failure.isError()) m_Failures++; else m_Assertions++; +} + +void TestProgressListener::endTest( Test * test) +{ + stdCOut() << "Result (" << test->getName() << ")"; + stdCOut().flush(); + + if ( !m_lastTestFailed ) + stdCOut() << " : OK"; + else + stdCOut() << " : Fail"; + stdCOut() << "\n\n"; +} + +int TestProgressListener::getResult() const { + return m_Failures + m_Assertions; +} + +void TestProgressListener::printResults() const { + stdCOut() << "Overal result: Tests: " << m_Tests << " Assertions: " << m_Assertions << " Failures: " << m_Failures << "\n"; +} + +CPPUNIT_NS_END + +int main(int argc, char* argv[]) { + try { + TCLAP::CmdLine cmd("Main test binary.", ' ', "0.01"); + + TCLAP::MultiArg<std::string> testPathSegments("p", "path", "test path", false, "string" ); + cmd.add( testPathSegments ); + + cmd.parse(argc, argv); + + CppUnit::TestResult controller; + + CppUnit::TestResultCollector result; + controller.addListener( &result ); + + CppUnit::TestProgressListener progressListener; + controller.addListener( &progressListener ); + + CppUnit::Test *suite = NULL; + std::string testPath = ""; + if(testPathSegments.getValue().size() == 0) { + // Get the top level suite from the registry + suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest(); + } else if(testPathSegments.getValue().size() == 1) { + suite = CppUnit::TestFactoryRegistry::getRegistry(testPathSegments.getValue()[0]).makeTest(); + } else { + suite = CppUnit::TestFactoryRegistry::getRegistry(testPathSegments.getValue()[0]).makeTest(); + bool first = true; + for(const std::string& path : testPathSegments.getValue()) { + if(first) { + first = false; + continue; + } + testPath += path + "/"; + } + testPath.pop_back(); + } + + // Adds the test to the list of test to run + CppUnit::TextUi::TestRunner runner; + runner.addTest( suite ); + + // Change the default outputter to a compiler error format outputter + runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(), std::cerr ) ); + // Run the tests. + runner.run( controller, testPath ); + + progressListener.printResults(); + + std::ofstream xmlFileResults("CppUnitTestResults.xml"); + CppUnit::XmlOutputter xmlOut(&result, xmlFileResults); + xmlOut.write(); + + return progressListener.getResult(); + } catch(const exception::AlibException& exception) { + std::cerr << exception.getCause() << std::endl; + return 1; + } catch(const TCLAP::ArgException& exception) { + std::cerr << exception.error() << std::endl; + return 2; + } catch (const std::exception& exception) { + std::cerr << "Exception caught: " << exception.what() << std::endl; + return 3; + } catch(...) { + std::cerr << "Unknown exception caught." << std::endl; + return 127; + } +} diff --git a/alib2measure/test-src/measurements/MeasurementsTest.cpp b/alib2measure/test-src/measurements/MeasurementsTest.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c043485c55ed26e129d9aa87ca8d6b84dace75ac --- /dev/null +++ b/alib2measure/test-src/measurements/MeasurementsTest.cpp @@ -0,0 +1,117 @@ +#include "MeasurementsTest.h" +#include "sax/SaxComposeInterface.h" +#include <thread> +#include <cmath> +#include <measure> + +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( MeasurementsTest, "measurements" ); +CPPUNIT_TEST_SUITE_REGISTRATION ( MeasurementsTest ); + +void MeasurementsTest::setUp ( ) { + measurements::reset ( ); +} + +void MeasurementsTest::tearDown ( ) { +} + +void MeasurementsTest::testConstructMeasurements ( ) { + +} + +void MeasurementsTest::testTimeMeasurements ( ) { + measurements::start ( "global", measurements::Type::OVERALL ); + measurements::start ( "init", measurements::Type::INIT ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) ); + measurements::end ( ); + measurements::start ( "main", measurements::Type::MAIN ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 20 ) ); + measurements::start ( "aux", measurements::Type::AUXILIARY ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) ); + measurements::end ( ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) ); + measurements::start ( "aux", measurements::Type::AUXILIARY ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) ); + measurements::end ( ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) ); + measurements::end ( ); + measurements::start ( "fin", measurements::Type::FINALIZE ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 30 ) ); + measurements::start ( "aux", measurements::Type::AUXILIARY ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) ); + measurements::end ( ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) ); + measurements::end ( ); + measurements::end ( ); + measurements::start ( "global2", measurements::Type::OVERALL ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) ); + measurements::end ( ); + measurements::start ( "global3", measurements::Type::OVERALL ); + measurements::start ( "init", measurements::Type::INIT ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 100 ) ); + measurements::end ( ); + measurements::start ( "main", measurements::Type::MAIN ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 20 ) ); + measurements::start ( "aux", measurements::Type::AUXILIARY ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) ); + measurements::end ( ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) ); + measurements::start ( "aux", measurements::Type::AUXILIARY ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 40 ) ); + measurements::end ( ); + std::this_thread::sleep_for ( std::chrono::milliseconds ( 80 ) ); + measurements::end ( ); + measurements::end ( ); + + std::cout << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::TREE << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::XML << measurements::results ( ) << std::endl; +} + +void MeasurementsTest::testMemoryMeasurements ( ) { + + measurements::start ( "chunk1", measurements::Type::MAIN ); + int * baz = new int[500]; + + delete[] baz; + measurements::end ( ); + + measurements::start ( "chunk2", measurements::Type::MAIN ); + int * foo = new int[1000]; + measurements::start ( "chunk21", measurements::Type::MAIN ); + int * bar = new int[2000]; + measurements::end ( ); + delete[] foo; + delete[] bar; + measurements::end ( ); + + std::cout << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::TREE << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::XML << measurements::results ( ) << std::endl; +} + +void MeasurementsTest::testCounterMeasurements ( ) { + + measurements::start ( "chunk1", measurements::Type::MAIN ); + measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::ADD, 5 } ); + measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::INC, 0 } ); + measurements::start ( "chunk11", measurements::Type::MAIN ); + measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} ); + measurements::start ( "chunk111", measurements::Type::MAIN ); + measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } ); + measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } ); + measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} ); + measurements::hint( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0} ); + measurements::end ( ); + measurements::start ( "chunk112", measurements::Type::MAIN ); + measurements::hint( measurements::CounterHint { "test1", measurements::CounterHint::Type::DEC, 0 } ); + measurements::hint( measurements::CounterHint { "test2", measurements::CounterHint::Type::SUB, 10 } ); + measurements::hint( measurements::CounterHint { "test3", measurements::CounterHint::Type::DEC, 0} ); + measurements::hint( measurements::CounterHint { "test4", measurements::CounterHint::Type::DEC, 0} ); + measurements::end ( ); + measurements::end ( ); + measurements::end ( ); + + std::cout << measurements::MeasurementFormat::LIST << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::TREE << measurements::results ( ) << std::endl; + std::cout << measurements::MeasurementFormat::XML << measurements::results ( ) << std::endl; +} \ No newline at end of file diff --git a/alib2measure/test-src/measurements/MeasurementsTest.h b/alib2measure/test-src/measurements/MeasurementsTest.h new file mode 100644 index 0000000000000000000000000000000000000000..4afc116c1689422a280a04129b4764f7b3eae93b --- /dev/null +++ b/alib2measure/test-src/measurements/MeasurementsTest.h @@ -0,0 +1,24 @@ +#ifndef MEASUREMENTS_TEST_H_ +#define MEASUREMENTS_TEST_H_ + +#include <cppunit/extensions/HelperMacros.h> + +class MeasurementsTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE ( MeasurementsTest ); + CPPUNIT_TEST ( testConstructMeasurements ); + CPPUNIT_TEST ( testTimeMeasurements ); + CPPUNIT_TEST ( testMemoryMeasurements ); + CPPUNIT_TEST ( testCounterMeasurements ); + CPPUNIT_TEST_SUITE_END ( ); + +public: + void setUp ( ); + void tearDown ( ); + + void testConstructMeasurements ( ); + void testTimeMeasurements ( ); + void testMemoryMeasurements ( ); + void testCounterMeasurements ( ); +}; + +#endif // MEASUREMENTS_TEST_H_ diff --git a/alib2raw/makefile.conf b/alib2raw/makefile.conf index 1db064aff3e3b542fe662badb9dbb321b9dcd219..0ed2cbe9ca69d7832cb399a0a99642884cd1ab26 100644 --- a/alib2raw/makefile.conf +++ b/alib2raw/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2raw TESTBIN:=alib2test -LINK_PATHS=../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alib2std/src/chrono b/alib2std/src/chrono deleted file mode 100644 index 551a83d5427954d0a5bd8d5b12ed951cb0d3775f..0000000000000000000000000000000000000000 --- a/alib2std/src/chrono +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __CHRONO_HEADER_WRAPPER_ -#define __CHRONO_HEADER_WRAPPER_ - -#include <bits/../chrono> -#include "vector" -#include "set" -#include "map" -#include "deque" -#include "exception" -#include "tuple" -#include "extensions/chrono.hpp" - -#endif /* __CHRONO_HEADER_WRAPPER_ */ diff --git a/alib2std/src/extensions/chrono.cpp b/alib2std/src/extensions/chrono.cpp deleted file mode 100644 index abc45638009c6506191853cfa3de81788eff8eb6..0000000000000000000000000000000000000000 --- a/alib2std/src/extensions/chrono.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/* - * chrono.cpp - * - * Created on: Apr 1, 2013 - * Author: Jan Travnicek - */ - -#include "../chrono" - -namespace std { - -namespace chrono { - -measurements measurements::INSTANCE; - -measurements::Format measurements::Format::LIST = { 0 }; -measurements::Format measurements::Format::TREE = { 1 }; - -measurements::Filter measurements::Filter::ALL = { true, ~0u }; -measurements::Filter measurements::Filter::NONE = { false, ~0u }; -measurements::Filter measurements::Filter::OVERALL = { true, measurements::Type::OVERALL }; -measurements::Filter measurements::Filter::NO_OVERALL = { false, measurements::Type::OVERALL }; -measurements::Filter measurements::Filter::INIT = { true, measurements::Type::INIT }; -measurements::Filter measurements::Filter::NO_INIT = { false, measurements::Type::INIT }; -measurements::Filter measurements::Filter::FINALIZE = { true, measurements::Type::FINALIZE }; -measurements::Filter measurements::Filter::NO_FINALIZE = { false, measurements::Type::FINALIZE }; -measurements::Filter measurements::Filter::MAIN = { true, measurements::Type::MAIN }; -measurements::Filter measurements::Filter::NO_MAIN = { false, measurements::Type::MAIN }; -measurements::Filter measurements::Filter::AUXILARY = { true, measurements::Type::AUXILARY }; -measurements::Filter measurements::Filter::NO_AUXILARY = { false, measurements::Type::AUXILARY }; - -const int measurements::measurements_format_index = std::ios::xalloc(); -const int measurements::measurements_filter_index = std::ios::xalloc(); - -void printAsList(std::ostream& out, const measurements::Results& data, unsigned index) { - const unsigned filter = out.iword(measurements::measurements_filter_index); - - if(data.results.size() - 1 != index) out << ", "; - if((std::get<1>(data[index]) & filter) == 0) out << data[index]; - for(unsigned idx : std::get<4>(data[index])) { - printAsList(out, data, idx); - } -} - -void subtreeSizes(std::ostream& out, const measurements::Results& data, unsigned index, std::map<unsigned, unsigned>& res) { - res[index] = 0; - - const unsigned filter = out.iword(measurements::measurements_filter_index); - if((std::get<1>(data[index]) & filter) == 0) res[index] += 1; - - for(unsigned idx : std::get<4>(data[index])) { - subtreeSizes(out, data, idx, res); - res[index] += res[idx]; - } -} - -void printAsTree(std::ostream& out, std::string& prefix, map<unsigned, unsigned>& indexToSize, const measurements::Results& data, unsigned index, bool last) { - const unsigned filter = out.iword(measurements::measurements_filter_index); - if((std::get<1>(data[index]) & filter) == 0) { - if(last) prefix[prefix.size() - 2] = '\\'; - if(indexToSize[index] != 1) prefix += "+"; - - out << prefix << data[index] << std::endl; - - if(indexToSize[index] == 1) prefix += "-"; - prefix += "-"; - if(last) prefix[prefix.size() - 4] = ' '; - prefix[prefix.size() - 3] = ' '; - prefix[prefix.size() - 2] = '|'; - - unsigned size = std::get<4>(data[index]).size(); - for(unsigned idx : std::get<4>(data[index])) { - printAsTree(out, prefix, indexToSize, data, idx, size == 1); - size--; - } - prefix[prefix.size() - 3] = '-'; - - prefix.pop_back(); - prefix.pop_back(); - } else { - unsigned size = std::get<4>(data[index]).size(); - for(unsigned idx : std::get<4>(data[index])) { - printAsTree(out, prefix, indexToSize, data, idx, size == 1 && last); - size --; - } - } -} - -std::ostream& operator<<(std::ostream& out, const measurements::Results& data) { - const unsigned format = out.iword(measurements::measurements_format_index); - - unsigned index = data.results.size() - 1; - if(format == measurements::Format::LIST.type) { - printAsList(out, data, index); - } else { - std::string prefix = "|-"; - std::map<unsigned, unsigned> indexToSize; - subtreeSizes(out, data, index, indexToSize); - - printAsTree(out, prefix, indexToSize, data, index, true); - } - -// out << format << " " << filter << " " << data.results; - return out; -} - -std::ostream& operator<<(std::ostream& out, microseconds time) { - out << time.count() << "ms"; - return out; -} - -std::ostream& operator<<(std::ostream& out, measurements::Type type) { - switch(type) { - case measurements::Type::INIT: - out << "INIT"; - break; - case measurements::Type::FINALIZE: - out << "FINALIZE"; - break; - case measurements::Type::MAIN: - out << "MAIN"; - break; - case measurements::Type::AUXILARY: - out << "AUXILARY"; - break; - case measurements::Type::OVERALL: - out << "OVERALL"; - break; - } - return out; -} - -} /* namespace chrono */ - -} /* namespace std */ - diff --git a/alib2std/src/extensions/chrono.hpp b/alib2std/src/extensions/chrono.hpp deleted file mode 100644 index 5c8660c39a05d2337f6c8dd899c25d8f5b39a042..0000000000000000000000000000000000000000 --- a/alib2std/src/extensions/chrono.hpp +++ /dev/null @@ -1,139 +0,0 @@ -/* - * clone.hpp - * - * Created on: Apr 1, 2013 - * Author: Jan Travnicek - */ - -#ifndef CHRONO_HPP_ -#define CHRONO_HPP_ - -namespace std { - -namespace chrono { - -class measure_duration { - time_point<system_clock> m_Start; - time_point<system_clock> m_End; - -public: - void start() { - m_Start = system_clock::now(); - } - - void end() { - m_End = system_clock::now(); - } - - microseconds duration() { - return duration_cast<microseconds>(m_End - m_Start); - } - -}; - -class measurements { -public: - enum Type { - OVERALL = 1, - INIT = 2, - FINALIZE = 4, - MAIN = 8, - AUXILARY = 16 - }; - - struct Format { - unsigned type; - - static Format LIST; - static Format TREE; - }; - - struct Filter { - bool set; - unsigned val; - - static Filter ALL; - static Filter NONE; - static Filter OVERALL; - static Filter NO_OVERALL; - static Filter INIT; - static Filter NO_INIT; - static Filter FINALIZE; - static Filter NO_FINALIZE; - static Filter MAIN; - static Filter NO_MAIN; - static Filter AUXILARY; - static Filter NO_AUXILARY; - - }; - - struct Results { - const std::vector<std::tuple<std::string, measurements::Type, microseconds, microseconds, std::set<unsigned>>>& results; - - const std::tuple<std::string, measurements::Type, microseconds, microseconds, std::set<unsigned>>& operator[](int idx) const { - return results[idx]; - } - }; - - static const int measurements_format_index; - static const int measurements_filter_index; - -private: - std::vector<std::tuple<std::string, measurements::Type, microseconds, microseconds, std::set<unsigned>>> measurements_vector; // name, type, complete duration, real duration - std::deque<std::tuple<std::string, measurements::Type, time_point<system_clock>, microseconds, std::set<unsigned>>> measurements_stack; // name, type, start, sub measurements duration - - static measurements INSTANCE; - -public: - static void start(std::string name, measurements::Type type) { - INSTANCE.measurements_stack.emplace_back(std::move(name), type, system_clock::now(), microseconds(0), std::set<unsigned>{}); - } - - static void end() { - if(INSTANCE.measurements_stack.empty()) throw std::logic_error("no measurement started"); - - std::tuple<std::string, measurements::Type, time_point<system_clock>, microseconds, std::set<unsigned>> current = std::move(INSTANCE.measurements_stack.back()); - INSTANCE.measurements_stack.pop_back(); - - microseconds dur = duration_cast<microseconds>(system_clock::now() - std::get<2>(current)); - - unsigned index = INSTANCE.measurements_vector.size(); - INSTANCE.measurements_vector.emplace_back(std::move(std::get<0>(current)), std::get<1>(current), dur, dur - std::get<3>(current), std::get<4>(current)); - if(!INSTANCE.measurements_stack.empty()) { - std::get<3>(INSTANCE.measurements_stack.back()) += std::get<2>(INSTANCE.measurements_vector.back()); - std::get<4>(INSTANCE.measurements_stack.back()).insert(index); - } - } - - static Results results() { - return { INSTANCE.measurements_vector }; - } - -}; - -std::ostream& operator<<(std::ostream& out, const measurements::Results& data); - -std::ostream& operator<<(std::ostream& out, microseconds time); - -std::ostream& operator<<(std::ostream& out, measurements::Type type); - -template<typename _CharT, typename _Traits> -inline basic_ostream<_CharT, _Traits>& operator <<( basic_ostream<_CharT, _Traits>& x, measurements::Format f) { - x.iword(measurements::measurements_format_index) = f.type; - return x; -} - -template<typename _CharT, typename _Traits> -inline basic_ostream<_CharT, _Traits>& operator <<( basic_ostream<_CharT, _Traits>& x, measurements::Filter f) { - if(f.set) - x.iword(measurements::measurements_filter_index) &= ~f.val; - else - x.iword(measurements::measurements_filter_index) |= f.val; - return x; -} - -} /* namespace chrono */ - -} /* namespace std */ - -#endif /* CHRONO_HPP_ */ diff --git a/alib2std/src/extensions/fdstream.cpp b/alib2std/src/extensions/fdstream.cpp new file mode 100644 index 0000000000000000000000000000000000000000..dee32ac7bb0a342e42f8bec0b7236664ec548285 --- /dev/null +++ b/alib2std/src/extensions/fdstream.cpp @@ -0,0 +1,80 @@ +/* + * Author: Radovan Cerveny + */ + +#include "fdstream.hpp" + +namespace std { + +const int FAIL_FD = -1; + +fdstreambuf::fdstreambuf ( int fd ) : fd ( fd ) { + setp ( buff.begin ( ), buff.end ( ) - 1 ); +} + +fdstreambuf::~fdstreambuf ( ) { + sync ( ); +} + +bool fdstreambuf::flush ( ) { + std::ptrdiff_t n = pptr ( ) - pbase ( ); + + ssize_t osz = write ( fd, buff.data ( ), n ); + + pbump ( -n ); + + return osz != -1; +} + +fdstreambuf::int_type fdstreambuf::overflow ( fdstreambuf::int_type ch ) { + if ( ch == traits_type::eof ( ) ) return traits_type::eof ( ); + + buff.back ( ) = ch; + + pbump ( 1 ); + + if ( !flush ( ) ) return traits_type::eof ( ); + + return ch; +} + +int fdstreambuf::sync ( ) { + return flush ( ) ? 0 : -1; +} + +fdaccessor::fdaccessor ( int new_fd, int fallback_fd ) { + if ( fcntl ( new_fd, F_GETFD ) == 0 ) { + fd = new_fd; + redirected = true; + } else if ( fcntl ( fallback_fd, F_GETFD ) == 0 ) { + fd = fallback_fd; + redirected = false; + } else { + fd = -1; + redirected = false; + } +} + +int fdaccessor::get_fd ( ) const { + return fd; +} + +bool fdaccessor::is_redirected ( ) const { + return redirected; +} + +ofdstream::ofdstream ( int fd, int fallback_fd = FAIL_FD) : fda ( fd, fallback_fd ), fdbuf ( fda.get_fd ( ) ) { + this->init ( & fdbuf ); + + if ( fda.get_fd ( ) == -1 ) + setstate ( ios_base::failbit ); +} + +ofdstream::~ofdstream ( ) { +} + +bool ofdstream::is_redirected ( ) const { + return fda.is_redirected ( ); +} + +} diff --git a/alib2std/src/extensions/fdstream.hpp b/alib2std/src/extensions/fdstream.hpp new file mode 100644 index 0000000000000000000000000000000000000000..d36abc7090e145ad193f9ac83c2aa518e01fc72f --- /dev/null +++ b/alib2std/src/extensions/fdstream.hpp @@ -0,0 +1,70 @@ +/* + * Author: Radovan Cerveny + */ + +/* + * ofdstream + * ofdstream takes a primary file descriptor (fd) and fallback file descriptor by constructor to use for output + * if the primary fd is not valid for any reason, ofdstream will try to use fallback fd, if even fallback fd is not valid, ofdstream sets its state to ios::fail + * if the primary fd (or fallback fd) is valid , it is used for successive buffered output + * + * supplied file descriptor has to be already open in order for ofdstream to work + * ofdstream does not close the file descriptor and does not change internal flags of the file descriptor during the lifetime of ofdstream and during destruction of ofdstream + * + * typical use is to use as primary fd some arbitrary fd (5) and for fallback fd some standard fd (2) if we wish to see the output + */ + +#ifndef FDSTREAM_HPP_ +#define FDSTREAM_HPP_ + +#include <unistd.h> +#include <fcntl.h> +#include <ostream> +#include <array> + +namespace std { + +extern const int FAIL_FD; + +class fdstreambuf : public streambuf { + static const size_t buff_sz = 512; + + int fd; + array < char_type, buff_sz > buff; + + bool flush ( ); + +protected: + int_type overflow ( int_type ); + int sync ( ); + +public: + explicit fdstreambuf ( int ); + virtual ~fdstreambuf ( ); + fdstreambuf ( const fdstreambuf & ) = delete; + fdstreambuf & operator =( const fdstreambuf & ) = delete; +}; + +class fdaccessor { + int fd; + bool redirected; + +public: + explicit fdaccessor ( int, int ); + int get_fd ( ) const; + bool is_redirected ( ) const; +}; + +class ofdstream : public ostream { + fdaccessor fda; + fdstreambuf fdbuf; + +public: + explicit ofdstream ( int, int ); + virtual ~ofdstream ( ); + bool is_redirected ( ) const; +}; + +} + +#endif /* FDSTREAM_HPP_ */ diff --git a/alib2std/src/extensions/iostream.cpp b/alib2std/src/extensions/iostream.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e47263d247d3ef60a65c941a226fbe32c141e3d6 --- /dev/null +++ b/alib2std/src/extensions/iostream.cpp @@ -0,0 +1,18 @@ +/* + * Author: Radovan Cerveny + */ + +#include "iostream.hpp" + +namespace std { + +const int CERR_FD = 2; + + // used for alib special logging +const int CALOG_FD = 4; +ofdstream calog ( CALOG_FD, CERR_FD ); + + // used for measurements output +const int CMEASURE_FD = 5; +ofdstream cmeasure ( CMEASURE_FD, CERR_FD ); +} diff --git a/alib2std/src/extensions/iostream.hpp b/alib2std/src/extensions/iostream.hpp new file mode 100644 index 0000000000000000000000000000000000000000..e8152327a21f49fcf56d5b828cf27e74c7b9195f --- /dev/null +++ b/alib2std/src/extensions/iostream.hpp @@ -0,0 +1,23 @@ +/* + * Author: Radovan Cerveny + */ + +#ifndef IOSTREAM_HPP_ +#define IOSTREAM_HPP_ + +#include "fdstream.hpp" + +namespace std { + +extern const int CERR_FD; + + // used for alib special logging +extern const int CALOG_FD; +extern ofdstream calog; + + // used for measurements output +extern const int CMEASURE_FD; +extern ofdstream cmeasure; +} + +#endif /* IOSTREAM_HPP_ */ diff --git a/alib2std/src/extensions/vector.hpp b/alib2std/src/extensions/vector.hpp index 7f6b0d59a9a58a66eebced02552f7eb34e519acd..268dfcbbb100be7e22d0cc5a273b9bcedcdd60a8 100644 --- a/alib2std/src/extensions/vector.hpp +++ b/alib2std/src/extensions/vector.hpp @@ -162,8 +162,8 @@ public: } }; -template< class T > -std::ostream& operator<<(std::ostream& out, const std::vector<T>& vector) { +template< class T , class Allocator > +std::ostream& operator<<(std::ostream& out, const std::vector<T, Allocator>& vector) { out << "["; bool first = true; @@ -192,9 +192,9 @@ std::ostream& operator<<(std::ostream& out, const std::ptr_vector<T>& vector) { return out; } -template<class T> -struct compare<vector<T>> { - int operator()(const vector<T>& first, const vector<T>& second) const { +template<class T, class Allocator> +struct compare<vector<T, Allocator>> { + int operator()(const vector<T, Allocator>& first, const vector<T, Allocator>& second) const { if(first.size() < second.size()) return -1; if(first.size() > second.size()) return 1; diff --git a/alib2std/src/fdstream b/alib2std/src/fdstream new file mode 100644 index 0000000000000000000000000000000000000000..b5798a55292a996f63e1072beebafb3ab4f2918c --- /dev/null +++ b/alib2std/src/fdstream @@ -0,0 +1,6 @@ +#ifndef __FDSTREAM_HEADER_WRAPPER_ +#define __FDSTREAM_HEADER_WRAPPER_ + +#include "extensions/fdstream.hpp" + +#endif /* __FDSTREAM_HEADER_WRAPPER_ */ diff --git a/alib2std/src/iostream b/alib2std/src/iostream new file mode 100644 index 0000000000000000000000000000000000000000..9eea11514aa4e94e2982d4422fe6de5ad91e1eee --- /dev/null +++ b/alib2std/src/iostream @@ -0,0 +1,7 @@ +#ifndef __IOSTREAM_HEADER_WRAPPER_ +#define __IOSTREAM_HEADER_WRAPPER_ + +#include <bits/../iostream> +#include "extensions/iostream.hpp" + +#endif /* __IOSTREAM_HEADER_WRAPPER_ */ diff --git a/alib2std/test-src/extensions/ChronoTest.cpp b/alib2std/test-src/extensions/ChronoTest.cpp deleted file mode 100644 index 9797999410a42a011b39cafdfc8702ec14fc1cbc..0000000000000000000000000000000000000000 --- a/alib2std/test-src/extensions/ChronoTest.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "ChronoTest.h" -#include <chrono> -#include <thread> -#include <cmath> - -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ChronoTest, "bits" ); -CPPUNIT_TEST_SUITE_REGISTRATION( ChronoTest ); - -void ChronoTest::setUp() { -} - -void ChronoTest::tearDown() { -} - -void ChronoTest::testChrono1() { - std::chrono::measure_duration tmp; - tmp.start(); - tmp.end(); - - std::cout << tmp.duration() << std::endl; - - auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(tmp.duration()); - std::cout << elapsed << std::endl; -} - -void ChronoTest::testChrono2() { - std::chrono::measurements meas; - meas.start("global", std::chrono::measurements::Type::OVERALL); - - std::chrono::measurements::start("init", std::chrono::measurements::Type::INIT); - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - std::chrono::measurements::end(); - - std::chrono::measurements::start("main", std::chrono::measurements::Type::MAIN); - std::this_thread::sleep_for(std::chrono::milliseconds(20)); - std::chrono::measurements::start("aux", std::chrono::measurements::Type::AUXILARY); - std::this_thread::sleep_for(std::chrono::milliseconds(40)); - std::chrono::measurements::end(); - std::this_thread::sleep_for(std::chrono::milliseconds(80)); - std::chrono::measurements::start("aux", std::chrono::measurements::Type::AUXILARY); - std::this_thread::sleep_for(std::chrono::milliseconds(40)); - std::chrono::measurements::end(); - std::this_thread::sleep_for(std::chrono::milliseconds(80)); - std::chrono::measurements::end(); - - std::chrono::measurements::start("fin", std::chrono::measurements::Type::FINALIZE); - std::this_thread::sleep_for(std::chrono::milliseconds(30)); - std::chrono::measurements::start("aux", std::chrono::measurements::Type::AUXILARY); - std::this_thread::sleep_for(std::chrono::milliseconds(40)); - std::chrono::measurements::end(); - std::this_thread::sleep_for(std::chrono::milliseconds(80)); - std::chrono::measurements::end(); - std::chrono::measurements::end(); - - std::cout << "Default print" << std::endl << std::chrono::measurements::results() << std::endl; - auto sum1 = std::get<3>(std::chrono::measurements::results()[1]) + std::get<3>(std::chrono::measurements::results()[2]) + std::get<3>(std::chrono::measurements::results()[3]); - auto exp1 = std::get<2>(std::chrono::measurements::results()[3]); - - CPPUNIT_ASSERT(std::abs(sum1.count() - exp1.count()) < 2000); - - auto sum2 = std::get<3>(std::chrono::measurements::results()[0]) + std::get<3>(std::chrono::measurements::results()[1]) + std::get<3>(std::chrono::measurements::results()[2]) + std::get<3>(std::chrono::measurements::results()[3]) + std::get<3>(std::chrono::measurements::results()[4]) + std::get<3>(std::chrono::measurements::results()[5]); - auto exp2 = std::get<2>(std::chrono::measurements::results()[6]); - - CPPUNIT_ASSERT(std::abs(sum2.count() - exp2.count()) < 2000); - - std::cout << "Tree print" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print none" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::NONE << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print all - main" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::ALL << std::chrono::measurements::Filter::NO_MAIN << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print all - overall" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::ALL << std::chrono::measurements::Filter::NO_OVERALL << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print all - overall, main" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::ALL << std::chrono::measurements::Filter::NO_OVERALL << std::chrono::measurements::Filter::NO_MAIN << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print all - overall, main, finalize" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::ALL << std::chrono::measurements::Filter::NO_OVERALL << std::chrono::measurements::Filter::NO_MAIN << std::chrono::measurements::Filter::NO_FINALIZE << std::chrono::measurements::results() << std::endl; - std::cout << "Tree print none + overall" << std::endl << std::chrono::measurements::Format::TREE << std::chrono::measurements::Filter::NONE << std::chrono::measurements::Filter::OVERALL << std::chrono::measurements::results() << std::endl; -} - diff --git a/alib2std/test-src/extensions/ChronoTest.h b/alib2std/test-src/extensions/ChronoTest.h deleted file mode 100644 index 6f1d4b6151751a110110187e61ba6185639fb3a2..0000000000000000000000000000000000000000 --- a/alib2std/test-src/extensions/ChronoTest.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CHRONO_TEST_H_ -#define CHRONO_TEST_H_ - -#include <cppunit/extensions/HelperMacros.h> - -class ChronoTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE( ChronoTest ); - CPPUNIT_TEST( testChrono1 ); - CPPUNIT_TEST( testChrono2 ); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp(); - void tearDown(); - - void testChrono1(); - void testChrono2(); -}; - -#endif // CHRONO_TEST_H_ diff --git a/alib2str/makefile.conf b/alib2str/makefile.conf index 15c320e468f6710c5fb0bc1780d68808a3dae3e3..78c5ea527d8e70445452d82957c1c8db9e5e15b1 100644 --- a/alib2str/makefile.conf +++ b/alib2str/makefile.conf @@ -1,5 +1,5 @@ LIBRARY:=alib2str TESTBIN:=alib2test -LINK_PATHS=../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alphabetManip2/makefile.conf b/alphabetManip2/makefile.conf index 0ff668d6c2389aa4d856d33cfda140e7f2556c5e..773310e4bcbec8d0d385860a3cef09dc9ebbe500 100644 --- a/alphabetManip2/makefile.conf +++ b/alphabetManip2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=alphabetManip2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/alphabetManip2/src/alphabetManip.cpp b/alphabetManip2/src/alphabetManip.cpp index e53c45950173d3e98e553f27efc788ae7bf88fdc..8f4d88c1059523e960886514b95b38fdfeee2bf4 100644 --- a/alphabetManip2/src/alphabetManip.cpp +++ b/alphabetManip2/src/alphabetManip.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -23,25 +24,25 @@ void process ( T & data, TCLAP::ValueArg < std::string > & operation, std::deque typedef typename std::remove_const < typename std::remove_reference < decltype ( data.getAlphabet ( ) ) >::type >::type alphabetType; if ( operation.getValue ( ) == "get" ) { - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); const alphabetType & res = data.getAlphabet ( ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( operation.getValue ( ) == "add" ) { alphabetType symbols = alib::XmlDataFactory::fromTokens < alphabetType > ( argumentTokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); data.extendAlphabet ( symbols ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( data ); } else if ( operation.getValue ( ) == "set" ) { @@ -84,8 +85,8 @@ int main ( int argc, char * argv[] ) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::deque < sax::Token > inputTokens; @@ -120,10 +121,10 @@ int main ( int argc, char * argv[] ) { throw exception::AlibException ( "Invalid data type" ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/aminimize2/makefile.conf b/aminimize2/makefile.conf index deb0e005f4a730d9dbce04f077816a0a598d53e1..f8991b2269e6185c4aa3c96cd43a03ffaa194d45 100644 --- a/aminimize2/makefile.conf +++ b/aminimize2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=aminimize2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/aminimize2/src/aminimize.cpp b/aminimize2/src/aminimize.cpp index c67a8d9aa7dbe84e847fc7a618e69b24c7266e44..f92093296f45a29ef97fa1a449168ef77dcc50e5 100644 --- a/aminimize2/src/aminimize.cpp +++ b/aminimize2/src/aminimize.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -40,8 +41,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -56,31 +57,31 @@ int main(int argc, char** argv) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if(algorithm.getValue() == "hopcroft") { automaton::Automaton res = automaton::simplify::Minimize::minimize(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else if(algorithm.getValue() == "brzozowski") { automaton::Automaton res = automaton::simplify::MinimizeBrzozowski::minimize(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); } else { throw exception::AlibException("Unknown algorithm selected."); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/anormalize2/makefile.conf b/anormalize2/makefile.conf index 32b5d168a89f323150f8b6729568ede65c6bbcd6..5c402f579b35c6e8b4c472a5c234056fea3566b4 100644 --- a/anormalize2/makefile.conf +++ b/anormalize2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=anormalize2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/anormalize2/src/anormalize.cpp b/anormalize2/src/anormalize.cpp index d233ca8a0a4efd16d0757f2225d8489a57196b66..92e28c399367463c79367340769a81d58899270b 100644 --- a/anormalize2/src/anormalize.cpp +++ b/anormalize2/src/anormalize.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -65,8 +66,8 @@ int main ( int argc, char * * argv ) { if ( measure.isSet ( ) ) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::deque < sax::Token > tokens; @@ -82,119 +83,119 @@ int main ( int argc, char * * argv ) { if ( labels.getValue ( ) == "automaton" ) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens < automaton::Automaton > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = automaton::simplify::Normalize::normalize ( automaton ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( labels.getValue ( ) == "grammar" ) { // grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); // grammar::Grammar res = grammar::simplify::Normalize::normalize(grammar); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); // alib::XmlDataFactory::toStdout(res); } else if ( alphabet.getValue ( ) == "string" ) { string::String string = alib::XmlDataFactory::fromTokens < string::String > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); string::String res = string::simplify::NormalizeAlphabet::normalize ( string ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "leftRG" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::LeftRG res = grammar::convert::ToGrammarLeftRG::convert ( grammar ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "rightRG" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::RightRG res = grammar::convert::ToGrammarRightRG::convert ( grammar ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "singleInitialState" ) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens < automaton::Automaton > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton res = automaton::simplify::SingleInitialState::convert ( automaton ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "CNF" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::Grammar res = grammar::simplify::ToCNF::convert ( grammar ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "GNF" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::Grammar res = grammar::simplify::ToGNF::convert ( grammar ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( form.getValue ( ) == "LL1" ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::Grammar res = grammar::parsing::DeterministicLL1Grammar::convert ( grammar ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else { throw exception::AlibException ( "Invalid normalize command" ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/arand2/makefile.conf b/arand2/makefile.conf index 4b7d7c44c3f83abe49b5d21513b765d0b75d289e..84e1e0b2fec821a389aecef3e7c19ef672d5b1d1 100644 --- a/arand2/makefile.conf +++ b/arand2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=arand2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/arand2/src/arand.cpp b/arand2/src/arand.cpp index ac10f296ed9f66662cd17dd7e0a0e4620e3d0a23..5609a18c2daed68cd423356cd953597270fe0019 100644 --- a/arand2/src/arand.cpp +++ b/arand2/src/arand.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <factory/XmlDataFactory.hpp> #include "automaton/generate/RandomAutomatonFactory.h" @@ -76,7 +77,7 @@ int main ( int argc, char * argv[] ) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); + measurements::start ( "Overal", measurements::Type::OVERALL ); if ( !type.isSet ( ) ) throw exception::AlibException ( "Type is not defined." ); @@ -85,12 +86,12 @@ int main ( int argc, char * argv[] ) { // TODO: floating point arithmetic throw exception::AlibException ( "You must specify density as a number between 1 and 100." ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::NFA res = automaton::generate::RandomAutomatonFactory::generateNFA ( states.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), density.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "CFG" ) { @@ -98,76 +99,76 @@ int main ( int argc, char * argv[] ) { // TODO: floating point arithmetic throw exception::AlibException ( "You must specify density as a number between 1 and 100." ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); grammar::CFG res = grammar::generate::RandomGrammarFactory::generateCFG ( nonterminals.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), density.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "RE" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); regexp::UnboundedRegExp res = regexp::generate::RandomRegExpFactory::generateUnboundedRegExp ( terminalNodes.getValue ( ), height.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "ST" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); string::LinearString res = string::generate::RandomStringFactory::generateLinearString ( length.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "UT" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); tree::UnrankedTree res = tree::generate::RandomTreeFactory::generateUnrankedTree ( height.getValue ( ), nodes.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), maxRank.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "UP" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); tree::UnrankedPattern res = tree::generate::RandomTreeFactory::generateUnrankedPattern ( height.getValue ( ), nodes.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), maxRank.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "RT" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); tree::RankedTree res = tree::generate::RandomTreeFactory::generateRankedTree ( height.getValue ( ), nodes.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), maxRank.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( type.getValue ( ) == "RP" ) { - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); tree::RankedPattern res = tree::generate::RandomTreeFactory::generateRankedPattern ( height.getValue ( ), nodes.getValue ( ), alphabetSize.getValue ( ), randomizedAlphabet.getValue ( ), maxRank.getValue ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else { throw exception::AlibException ( "Invalid type." ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/araw2/makefile.conf b/araw2/makefile.conf index c4236876acc9146461a183d7a6783ad6563ee646..e30471749d14e4a21126fe8e815a3e6ddc18d810 100644 --- a/araw2/makefile.conf +++ b/araw2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=araw2 -LINK_PATHS=../alib2raw/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2raw alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2raw/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2raw/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2raw alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2raw/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/araw2/src/araw.cpp b/araw2/src/araw.cpp index 8bd6393a97a5ebc75847f420c02c81b525a5a93c..de152a96829746919a93e2579a2cbc5dab1f2769 100644 --- a/araw2/src/araw.cpp +++ b/araw2/src/araw.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <string> #include <exception/AlibException.h> #include <RawApi.hpp> @@ -53,8 +54,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); if(tree_from_raw.getValue()) { std::deque<sax::Token> tokens; @@ -71,8 +72,8 @@ int main(int argc, char** argv) { std::deque<sax::Token>::iterator iter = tokens.begin(); tree::Tree tree = alib::FromRawParsers::treeParser.parseTree(iter); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(tree); } else if(tree_to_raw.getValue()) { @@ -89,8 +90,8 @@ int main(int argc, char** argv) { tree::Tree tree = alib::XmlDataFactory::fromTokens<tree::Tree>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens2; tree::TreeToRawComposer::compose(tokens2, tree); @@ -99,10 +100,10 @@ int main(int argc, char** argv) { throw exception::AlibException("Invalid input format specified"); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) { diff --git a/arename2/makefile.conf b/arename2/makefile.conf index eaa53cc3e339337c0cff43194745b3c56ceef990..2ffb0cd954e937d3de4f59d564778319fb8a3ab4 100644 --- a/arename2/makefile.conf +++ b/arename2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=arename2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/arename2/src/arename.cpp b/arename2/src/arename.cpp index 8805678a33faa92c6d42f7fee0dc9321a19f355e..5be45895354d0a5a1cadb33dce3e4a180f22f1ca 100644 --- a/arename2/src/arename.cpp +++ b/arename2/src/arename.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -33,8 +34,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -49,20 +50,20 @@ int main(int argc, char** argv) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::simplify::Rename::rename(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/areverse2/makefile.conf b/areverse2/makefile.conf index 443073d8fa99da012a88fe257e3247f44a9b0ae9..9cbf3206dd0223aa346e3dc9ee0d48edfd04e9f2 100644 --- a/areverse2/makefile.conf +++ b/areverse2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=areverse2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/areverse2/src/areverse.cpp b/areverse2/src/areverse.cpp index 9718a8b7ac6d21af195d37ddcabd490c79db16cc..906cffc827e3960b0cfa591dba857db3d7fcbb43 100644 --- a/areverse2/src/areverse.cpp +++ b/areverse2/src/areverse.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <iostream> #include "exception/AlibException.h" @@ -34,8 +35,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -50,20 +51,20 @@ int main(int argc, char** argv) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); automaton::Automaton res = automaton::transform::Reverse::convert(automaton); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout(res); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch (const exception::AlibException& exception) { diff --git a/arun2/makefile.conf b/arun2/makefile.conf index c249be52606d2fb969e8a53e94b29eaa93282866..63a8d976d38d7324b02b99e4ed4a94593bd97218 100644 --- a/arun2/makefile.conf +++ b/arun2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=arun2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/arun2/src/arun.cpp b/arun2/src/arun.cpp index 93a6ba3e5780761f1410cadc87a466427a01d35f..614d0c1fa11f454038810a49e5c6462fa9f2576a 100644 --- a/arun2/src/arun.cpp +++ b/arun2/src/arun.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -55,8 +56,8 @@ int main(int argc, char* argv[]) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> inputTokens; if(input.isSet()) { @@ -83,38 +84,38 @@ int main(int argc, char* argv[]) { alib::Object inputData = alib::XmlDataFactory::fromTokens<alib::Object>(inputTokens); automaton::Automaton automatonData = alib::XmlDataFactory::fromTokens<automaton::Automaton>(automatonTokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if( type.getValue() == "occurrences") { std::set<unsigned> res = automaton::run::Occurrences::occurrences(automatonData, inputData); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( type.getValue() == "accept") { bool res = automaton::run::Accept::accept(automatonData, inputData); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( type.getValue() == "result") { label::Label res = automaton::run::Result::result(automatonData, inputData); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else { throw exception::AlibException( "Invalid run type" ); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/astat2/makefile.conf b/astat2/makefile.conf index 344ff068313a74d8e28cebff0ceba471c7e54823..f3e39205df910d877be17f62c91b02e4a55a46b3 100644 --- a/astat2/makefile.conf +++ b/astat2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=astat2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/astat2/src/astat.cpp b/astat2/src/astat.cpp index 54e59d2667488dd5f69ed29015b40d91f0b118cb..442831dd0ea09f0d5760b7f1cba6fcca1438e6e0 100644 --- a/astat2/src/astat.cpp +++ b/astat2/src/astat.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -123,8 +124,8 @@ int main ( int argc, char * argv[] ) { if ( measure.isSet ( ) ) common::GlobalData::measure = true; - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); PrintingOptions printingOption = translatePrintingOptions ( presentation.getValue ( ) ); @@ -162,8 +163,8 @@ int main ( int argc, char * argv[] ) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens < automaton::Automaton > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); AutomataStat::stat ( automaton, settings ); } else if ( alib::XmlDataFactory::first < grammar::Grammar > ( tokens ) && grammar.isSet ( ) ) { @@ -186,8 +187,8 @@ int main ( int argc, char * argv[] ) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens < grammar::Grammar > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); GrammarStat::stat ( grammar, settings ); } else if ( alib::XmlDataFactory::first < regexp::RegExp > ( tokens ) && regexp.isSet ( ) ) { @@ -204,8 +205,8 @@ int main ( int argc, char * argv[] ) { regexp::RegExp regexp = alib::XmlDataFactory::fromTokens < regexp::RegExp > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); RegExpStat::stat ( regexp, settings ); } else if ( alib::XmlDataFactory::first < string::String > ( tokens ) && string.isSet ( ) ) { @@ -222,8 +223,8 @@ int main ( int argc, char * argv[] ) { string::String string = alib::XmlDataFactory::fromTokens < string::String > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); StringStat::stat ( string, settings ); } else if ( alib::XmlDataFactory::first < tree::Tree > ( tokens ) && tree.isSet ( ) ) { @@ -240,8 +241,8 @@ int main ( int argc, char * argv[] ) { tree::Tree tree = alib::XmlDataFactory::fromTokens < tree::Tree > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); TreeStat::stat ( tree, settings ); } else if ( alib::XmlDataFactory::first < container::ObjectsSet > ( tokens ) && set.isSet ( ) ) { @@ -250,8 +251,8 @@ int main ( int argc, char * argv[] ) { container::ObjectsSet data = alib::XmlDataFactory::fromTokens < container::ObjectsSet > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); SetStat::stat ( data, settings ); } else if ( alib::XmlDataFactory::first < label::LabelSetLabel > ( tokens ) && set.isSet ( ) ) { @@ -260,8 +261,8 @@ int main ( int argc, char * argv[] ) { label::LabelSetLabel data = alib::XmlDataFactory::fromTokens < label::LabelSetLabel > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); SetStat::stat ( data, settings ); } else if ( alib::XmlDataFactory::first < alphabet::SymbolSetSymbol > ( tokens ) && set.isSet ( ) ) { @@ -270,18 +271,18 @@ int main ( int argc, char * argv[] ) { alphabet::SymbolSetSymbol data = alib::XmlDataFactory::fromTokens < alphabet::SymbolSetSymbol > ( tokens ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Stats print", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Stats print", measurements::Type::MAIN ); SetStat::stat ( data, settings ); } else { throw exception::AlibException ( "Input not recognized." ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/astringology2/makefile.conf b/astringology2/makefile.conf index c146f662397375f663d099bc6f59fb8d1c557b4a..e74c1a8f19ede408a45b6d7b2206073e14bb509e 100644 --- a/astringology2/makefile.conf +++ b/astringology2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=astringology2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/astringology2/src/astringology.cpp b/astringology2/src/astringology.cpp index ff4de1725c141fc0e517d93a3514f17965d2fc78..30c451225b0984a526d2f25f393d6d32d1113532 100644 --- a/astringology2/src/astringology.cpp +++ b/astringology2/src/astringology.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -95,8 +96,8 @@ int main ( int argc, char * argv[] ) { } else { } - std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); - std::chrono::measurements::start ( "Input read", std::chrono::measurements::Type::AUXILARY ); + measurements::start ( "Overal", measurements::Type::OVERALL ); + measurements::start ( "Input read", measurements::Type::AUXILIARY ); std::deque < std::deque < sax::Token > > subjectTokens; @@ -140,100 +141,100 @@ int main ( int argc, char * argv[] ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); string::String pattern = alib::XmlDataFactory::fromTokens < string::String > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = stringology::exact::ExactFactorMatch::match ( subject, pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "boyerMooreHorspool" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); string::String pattern = alib::XmlDataFactory::fromTokens < string::String > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = stringology::exact::BoyerMooreHorspool::match ( subject, pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "reversedBoyerMooreHorspool" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); string::String pattern = alib::XmlDataFactory::fromTokens < string::String > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = stringology::exact::ReversedBoyerMooreHorspool::match ( subject, pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "deadZoneUsingBadCharacterShift" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); string::String pattern = alib::XmlDataFactory::fromTokens < string::String > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::set < unsigned > res = stringology::exact::DeadZoneUsingBadCharacterShift::match ( subject, pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( res ); } else if ( algorithm.getValue ( ) == "exactMatchingAutomaton" ) { string::String pattern = alib::XmlDataFactory::fromTokens < string::String > ( patternTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton automaton = stringology::exact::ExactMatchingAutomaton::construct ( pattern ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( automaton ); } else if ( algorithm.getValue ( ) == "exactFactorAutomaton" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton automaton = stringology::exact::ExactFactorAutomaton::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( automaton ); } else if ( algorithm.getValue ( ) == "exactSubsequenceAutomaton" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton automaton = stringology::exact::ExactSubsequenceAutomaton::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( automaton ); } else if ( algorithm.getValue ( ) == "exactNondeterministicSubsequenceAutomaton" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton automaton = stringology::exact::ExactNondeterministicSubsequenceAutomaton::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( automaton ); } else if ( algorithm.getValue ( ) == "exactMultiNondeterministicSubsequenceAutomaton" ) { @@ -242,47 +243,47 @@ int main ( int argc, char * argv[] ) { for ( std::deque < sax::Token > & tokens : subjectTokens ) subjects.insert ( alib::XmlDataFactory::fromTokens < string::String > ( tokens ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); automaton::Automaton automaton = stringology::exact::ExactMultiNondeterministicSubsequenceAutomaton::construct ( subjects ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( automaton ); } else if ( algorithm.getValue ( ) == "borderArray" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); std::vector < unsigned > borderArray = stringology::exact::BorderArray::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( borderArray ); } else if ( algorithm.getValue ( ) == "suffixTrie" ) { string::String subject = alib::XmlDataFactory::fromTokens < string::String > ( subjectTokens.front ( ) ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN ); + measurements::end ( ); + measurements::start ( "Algorithm", measurements::Type::MAIN ); indexes::SuffixTrieFinalMark suffixTrie = stringology::indexing::SuffixTrie::construct ( subject ); - std::chrono::measurements::end ( ); - std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY ); + measurements::end ( ); + measurements::start ( "Output write", measurements::Type::AUXILIARY ); alib::XmlDataFactory::toStdout ( suffixTrie ); } else { throw exception::AlibException ( "Invalid algorithm" ); } - std::chrono::measurements::end ( ); - std::chrono::measurements::end ( ); + measurements::end ( ); + measurements::end ( ); - if ( measure.getValue ( ) ) std::clog << std::chrono::measurements::results ( ) << std::endl; + if ( measure.getValue ( ) ) std::cmeasure << measurements::results ( ) << std::endl; return 0; } catch ( const exception::AlibException & exception ) { diff --git a/atrim2/makefile.conf b/atrim2/makefile.conf index 743e04a4c41f106b058f0e15a05c722a875b4cae..b970c6d9c48be7da7bca13c49db0d15543b5c019 100644 --- a/atrim2/makefile.conf +++ b/atrim2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=atrim2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/atrim2/src/atrim.cpp b/atrim2/src/atrim.cpp index 8408fa23b36ae3c656692b76387b9797eb9fe0fa..1e21a4d4e263fa9cc09b4e8dc407e4caf206da18 100644 --- a/atrim2/src/atrim.cpp +++ b/atrim2/src/atrim.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -88,8 +89,8 @@ int main(int argc, char* argv[]) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -105,56 +106,56 @@ int main(int argc, char* argv[]) { if( alib::XmlDataFactory::first<automaton::Automaton>(tokens)) { automaton::Automaton automaton = alib::XmlDataFactory::fromTokens<automaton::Automaton>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); if(efficient.getValue()) { automaton::Automaton res = efficientTrimAutomaton(automaton, unreachable.getValue(), useless.getValue() ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else { automaton::Automaton res = trimAutomaton(automaton, unreachable.getValue(), useless.getValue() ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } } else if( alib::XmlDataFactory::first<grammar::Grammar>(tokens)) { grammar::Grammar grammar = alib::XmlDataFactory::fromTokens<grammar::Grammar>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); grammar::Grammar res = trimGrammar(grammar, unreachable.getValue(), useless.getValue() ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else if( alib::XmlDataFactory::first<regexp::RegExp>(tokens)) { regexp::RegExp regexp = alib::XmlDataFactory::fromTokens<regexp::RegExp>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Algorithm", std::chrono::measurements::Type::MAIN); + measurements::end(); + measurements::start("Algorithm", measurements::Type::MAIN); regexp::RegExp res = optimizeRegExp( regexp ); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); alib::XmlDataFactory::toStdout( res ); } else { throw exception::AlibException( "Input not recognized." ); } - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch( const exception::AlibException & exception ) { diff --git a/makefile b/makefile index c88824b4a32c33ecf3f2719715713208c939b0c4..dc2cc8736decdb2c5caf38485921f13877b98a26 100644 --- a/makefile +++ b/makefile @@ -6,6 +6,7 @@ BINFOLDER = bin STD_LIB = alib2std CORE_LIB = alib2data +MEASURE_LIB = alib2measure STR_LIB = alib2str RAW_LIB = alib2raw ALGO_LIB = alib2algo @@ -65,12 +66,12 @@ endif SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile)) -.PHONY: $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ - $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ - $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ - $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ - $(addsuffix .build-debug-tests , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ - $(addsuffix .build-release-tests, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ +.PHONY: $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ + $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ + $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ + $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ + $(addsuffix .build-debug-tests , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \ + $(addsuffix .build-release-tests, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\ all-debug build-debug build-test-debug unit-test-debug clean-debug \ all-release build-release build-test-release unit-test-release clean-release \ debug release clean doc all @@ -88,7 +89,7 @@ debug: all-debug mkdir -p $(addsuffix -debug, $(BINFOLDER));\ fi rm -rf $(addsuffix -debug, $(BINFOLDER))/* - for dir in $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB); do \ + for dir in $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB); do \ cp $$dir/lib-debug/* $(addsuffix -debug, $(BINFOLDER)); \ done for dir in $(SUBDIRS_BINS); do \ @@ -112,7 +113,7 @@ release: all-release mkdir -p $(addsuffix -release, $(BINFOLDER));\ fi rm -rf $(addsuffix -release, $(BINFOLDER))/* - for dir in $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB); do \ + for dir in $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB); do \ cp $$dir/lib-release/* $(addsuffix -release, $(BINFOLDER)); \ done for dir in $(SUBDIRS_BINS); do \ @@ -131,21 +132,21 @@ clean : clean-debug clean-release -all-debug : $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) +all-debug : $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) -all-release : $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) +all-release : $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) -build-debug : $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) +build-debug : $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) -build-release: $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) +build-release: $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) -build-tests-debug : $(addsuffix .build-tests-debug , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB)) +build-tests-debug : $(addsuffix .build-tests-debug , $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB)) -build-tests-release: $(addsuffix .build-tests-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB)) +build-tests-release: $(addsuffix .build-tests-release, $(STD_LIB) $(CORE_LIB) $(MEASURE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB)) @@ -155,7 +156,10 @@ $(addsuffix .all-debug, $(STD_LIB)): $(addsuffix .all-debug, $(CORE_LIB)): $(addsuffix .all-debug, $(STD_LIB)) $(MAKE) debug -C $(basename $@) -$(addsuffix .all-debug, $(STR_LIB)): $(addsuffix .all-debug, $(CORE_LIB)) +$(addsuffix .all-debug, $(MEASURE_LIB)): $(addsuffix .all-debug, $(CORE_LIB)) + $(MAKE) debug -C $(basename $@) + +$(addsuffix .all-debug, $(STR_LIB)): $(addsuffix .all-debug, $(MEASURE_LIB)) $(MAKE) debug -C $(basename $@) $(addsuffix .all-debug, $(RAW_LIB)): $(addsuffix .all-debug, $(STR_LIB)) @@ -178,7 +182,10 @@ $(addsuffix .all-release, $(STD_LIB)): $(addsuffix .all-release, $(CORE_LIB)): $(addsuffix .all-release, $(STD_LIB)) $(MAKE) release -C $(basename $@) -$(addsuffix .all-release, $(STR_LIB)): $(addsuffix .all-release, $(CORE_LIB)) +$(addsuffix .all-release, $(MEASURE_LIB)): $(addsuffix .all-release, $(CORE_LIB)) + $(MAKE) release -C $(basename $@) + +$(addsuffix .all-release, $(STR_LIB)): $(addsuffix .all-release, $(MEASURE_LIB)) $(MAKE) release -C $(basename $@) $(addsuffix .all-release, $(RAW_LIB)): $(addsuffix .all-release, $(STR_LIB)) @@ -201,7 +208,10 @@ $(addsuffix .build-debug, $(STD_LIB)): $(addsuffix .build-debug, $(CORE_LIB)): $(addsuffix .build-debug, $(STD_LIB)) $(MAKE) build-debug -C $(basename $@) -$(addsuffix .build-debug, $(STR_LIB)): $(addsuffix .build-debug, $(CORE_LIB)) +$(addsuffix .build-debug, $(MEASURE_LIB)): $(addsuffix .build-debug, $(CORE_LIB)) + $(MAKE) build-debug -C $(basename $@) + +$(addsuffix .build-debug, $(STR_LIB)): $(addsuffix .build-debug, $(MEASURE_LIB)) $(MAKE) build-debug -C $(basename $@) $(addsuffix .build-debug, $(RAW_LIB)): $(addsuffix .build-debug, $(STR_LIB)) @@ -224,7 +234,10 @@ $(addsuffix .build-release, $(STD_LIB)): $(addsuffix .build-release, $(CORE_LIB)): $(addsuffix .build-release, $(STD_LIB)) $(MAKE) build-release -C $(basename $@) -$(addsuffix .build-release, $(STR_LIB)): $(addsuffix .build-release, $(CORE_LIB)) +$(addsuffix .build-release, $(MEASURE_LIB)): $(addsuffix .build-release, $(CORE_LIB)) + $(MAKE) build-release -C $(basename $@) + +$(addsuffix .build-release, $(STR_LIB)): $(addsuffix .build-release, $(MEASURE_LIB)) $(MAKE) build-release -C $(basename $@) $(addsuffix .build-release, $(RAW_LIB)): $(addsuffix .build-release, $(STR_LIB)) @@ -247,7 +260,10 @@ $(addsuffix .build-tests-debug, $(STD_LIB)): $(addsuffix .build-debug, $(STD_LIB $(addsuffix .build-tests-debug, $(CORE_LIB)): $(addsuffix .build-tests-debug, $(STD_LIB)) $(addsuffix .build-debug, $(CORE_LIB)) $(MAKE) build-tests-debug -C $(basename $@) -$(addsuffix .build-tests-debug, $(STR_LIB)): $(addsuffix .build-tests-debug, $(CORE_LIB)) $(addsuffix .build-debug, $(STR_LIB)) +$(addsuffix .build-tests-debug, $(MEASURE_LIB)): $(addsuffix .build-tests-debug, $(CORE_LIB)) $(addsuffix .build-debug, $(MEASURE_LIB)) + $(MAKE) build-tests-debug -C $(basename $@) + +$(addsuffix .build-tests-debug, $(STR_LIB)): $(addsuffix .build-tests-debug, $(MEASURE_LIB)) $(addsuffix .build-debug, $(STR_LIB)) $(MAKE) build-tests-debug -C $(basename $@) $(addsuffix .build-tests-debug, $(RAW_LIB)): $(addsuffix .build-tests-debug, $(STR_LIB)) $(addsuffix .build-debug, $(RAW_LIB)) @@ -267,7 +283,10 @@ $(addsuffix .build-tests-release, $(STD_LIB)): $(addsuffix .build-release, $(STD $(addsuffix .build-tests-release, $(CORE_LIB)): $(addsuffix .build-tests-release, $(STD_LIB)) $(addsuffix .build-release, $(CORE_LIB)) $(MAKE) build-tests-release -C $(basename $@) -$(addsuffix .build-tests-release, $(STR_LIB)): $(addsuffix .build-tests-release, $(CORE_LIB)) $(addsuffix .build-release, $(STR_LIB)) +$(addsuffix .build-tests-release, $(MEASURE_LIB)): $(addsuffix .build-tests-release, $(CORE_LIB)) $(addsuffix .build-release, $(MEASURE_LIB)) + $(MAKE) build-tests-release -C $(basename $@) + +$(addsuffix .build-tests-release, $(STR_LIB)): $(addsuffix .build-tests-release, $(MEASURE_LIB)) $(addsuffix .build-release, $(STR_LIB)) $(MAKE) build-tests-release -C $(basename $@) $(addsuffix .build-tests-release, $(RAW_LIB)): $(addsuffix .build-tests-release, $(STR_LIB)) $(addsuffix .build-release, $(RAW_LIB)) @@ -296,6 +315,7 @@ clean-release: doc: $(MAKE) doc -C alib2std $(MAKE) doc -C alib2data + $(MAKE) doc -C alib2measure $(MAKE) doc -C alib2str $(MAKE) doc -C alib2raw $(MAKE) doc -C alib2algo diff --git a/tniceprint/makefile.conf b/tniceprint/makefile.conf index 44a4d578a2a2b0ca3a4e2d56a3c2f4a936d477c3..39911426a0a2462d18862564288141394b22cba3 100644 --- a/tniceprint/makefile.conf +++ b/tniceprint/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=atniceprint -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ diff --git a/tniceprint/src/tniceprint.cpp b/tniceprint/src/tniceprint.cpp index 9ed22a1b46d264dbb9bcf9106e31c6da5aa457f5..429b8b44e3e905c00bdeef51a3394c600b0cf178 100644 --- a/tniceprint/src/tniceprint.cpp +++ b/tniceprint/src/tniceprint.cpp @@ -7,6 +7,7 @@ #include <tclap/CmdLine.h> #include <common/GlobalData.h> +#include <measure> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -36,8 +37,8 @@ int main(int argc, char** argv) { if(measure.isSet()) common::GlobalData::measure = true; - std::chrono::measurements::start("Overal", std::chrono::measurements::Type::OVERALL); - std::chrono::measurements::start("Input read", std::chrono::measurements::Type::AUXILARY); + measurements::start("Overal", measurements::Type::OVERALL); + measurements::start("Input read", measurements::Type::AUXILIARY); std::deque<sax::Token> tokens; if(input.isSet()) { @@ -53,23 +54,23 @@ int main(int argc, char** argv) { if (alib::XmlDataFactory::first<tree::RankedTree>(tokens)) { const tree::RankedTree & tree = alib::XmlDataFactory::fromTokens<tree::RankedTree>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); tree.nicePrint(std::cout); } else if (alib::XmlDataFactory::first<tree::UnrankedTree>(tokens)) { const tree::UnrankedTree & tree = alib::XmlDataFactory::fromTokens<tree::UnrankedTree>(tokens); - std::chrono::measurements::end(); - std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY); + measurements::end(); + measurements::start("Output write", measurements::Type::AUXILIARY); tree.nicePrint(std::cout); } else throw exception::AlibException("no tree on input"); - std::chrono::measurements::end(); - std::chrono::measurements::end(); + measurements::end(); + measurements::end(); - if(measure.getValue()) std::clog << std::chrono::measurements::results() << std::endl; + if(measure.getValue()) std::cmeasure << measurements::results() << std::endl; return 0; } catch(const exception::AlibException& exception) {