From 6638ed46c5f1cf1c371f03c0a6cc066dcf13fd88 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Mon, 26 Oct 2015 10:28:48 +0100 Subject: [PATCH] set verbose and measure global variables --- aarbology2/src/aarbology.cpp | 6 ++++++ acast2/src/acast.cpp | 6 ++++++ acompaction2/src/acompaction.cpp | 8 +++++++- acompare2/src/acompare.cpp | 6 ++++++ aconversions2/src/aconversion.cpp | 6 ++++++ aconvert2/src/aconvert.cpp | 6 ++++++ aderivation2/src/aderivation.cpp | 6 ++++++ adeterminize2/src/adeterminize.cpp | 6 ++++++ aecho2/src/aecho.cpp | 6 ++++++ aepsilon2/src/aepsilon.cpp | 6 ++++++ agenerate2/src/agenerate.cpp | 6 ++++++ aintegral2/src/aintegral.cpp | 6 ++++++ alangop2/src/alangop.cpp | 6 ++++++ alib2data/src/common/GlobalData.cpp | 16 ++++++++++++++++ alib2data/src/common/GlobalData.h | 22 ++++++++++++++++++++++ alphabetManip2/src/alphabetManip.cpp | 6 ++++++ aminimize2/src/aminimize.cpp | 6 ++++++ anormalize2/src/anormalize.cpp | 6 ++++++ arand2/src/arand.cpp | 6 ++++++ araw2/src/araw.cpp | 6 ++++++ arename2/src/arename.cpp | 6 ++++++ areverse2/src/areverse.cpp | 8 +++++++- arun2/src/arun.cpp | 6 ++++++ astat2/src/astat.cpp | 6 ++++++ astringology2/src/astringology.cpp | 6 ++++++ atrim2/src/atrim.cpp | 6 ++++++ tniceprint/src/tniceprint.cpp | 6 ++++++ 27 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 alib2data/src/common/GlobalData.cpp create mode 100644 alib2data/src/common/GlobalData.h diff --git a/aarbology2/src/aarbology.cpp b/aarbology2/src/aarbology.cpp index 3202948a49..4e31b5ede0 100644 --- a/aarbology2/src/aarbology.cpp +++ b/aarbology2/src/aarbology.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -56,6 +57,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + if(measure.isSet()) + common::GlobalData::measure = true; + int needPattern = 0; int needSubject = 0; diff --git a/acast2/src/acast.cpp b/acast2/src/acast.cpp index 407b93f4ec..39e3d92b6b 100644 --- a/acast2/src/acast.cpp +++ b/acast2/src/acast.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -34,6 +35,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); std::deque<sax::Token> tokens; diff --git a/acompaction2/src/acompaction.cpp b/acompaction2/src/acompaction.cpp index a093feaa6d..a6e6245e4e 100644 --- a/acompaction2/src/acompaction.cpp +++ b/acompaction2/src/acompaction.cpp @@ -5,8 +5,9 @@ * Author: Tomas Pecka */ -#include <iostream> #include <tclap/CmdLine.h> +#include <common/GlobalData.h> +#include <iostream> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -29,6 +30,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/acompare2/src/acompare.cpp b/acompare2/src/acompare.cpp index d7b1a8650a..308b1cb365 100644 --- a/acompare2/src/acompare.cpp +++ b/acompare2/src/acompare.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include "factory/XmlDataFactory.hpp" #include "exception/AlibException.h" @@ -33,6 +34,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp index 9a19de88ff..284dca48c5 100644 --- a/aconversions2/src/aconversion.cpp +++ b/aconversions2/src/aconversion.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <sax/SaxParseInterface.h> #include <sax/ParserException.h> @@ -39,6 +40,11 @@ int main(int argc, char* argv[]) cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/aconvert2/src/aconvert.cpp b/aconvert2/src/aconvert.cpp index 1989751617..f613befa26 100644 --- a/aconvert2/src/aconvert.cpp +++ b/aconvert2/src/aconvert.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <fstream> #include "factory/XmlDataFactory.hpp" @@ -174,6 +175,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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 ); diff --git a/aderivation2/src/aderivation.cpp b/aderivation2/src/aderivation.cpp index 625ff05d61..215aa49294 100644 --- a/aderivation2/src/aderivation.cpp +++ b/aderivation2/src/aderivation.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -29,6 +30,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/adeterminize2/src/adeterminize.cpp b/adeterminize2/src/adeterminize.cpp index 8a8ff3543b..b0491cd0bf 100644 --- a/adeterminize2/src/adeterminize.cpp +++ b/adeterminize2/src/adeterminize.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include "automaton/Automaton.h" #include "factory/XmlDataFactory.hpp" @@ -27,6 +28,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/aecho2/src/aecho.cpp b/aecho2/src/aecho.cpp index c94098ef76..a293e20238 100644 --- a/aecho2/src/aecho.cpp +++ b/aecho2/src/aecho.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -30,6 +31,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/aepsilon2/src/aepsilon.cpp b/aepsilon2/src/aepsilon.cpp index d643140a5c..1ed3a7c0f8 100644 --- a/aepsilon2/src/aepsilon.cpp +++ b/aepsilon2/src/aepsilon.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -40,6 +41,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/agenerate2/src/agenerate.cpp b/agenerate2/src/agenerate.cpp index f1d6558f2d..b2ed27a49d 100644 --- a/agenerate2/src/agenerate.cpp +++ b/agenerate2/src/agenerate.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -33,6 +34,11 @@ int main(int argc, char* argv[]) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/aintegral2/src/aintegral.cpp b/aintegral2/src/aintegral.cpp index ee69721452..7cecf8ecf1 100644 --- a/aintegral2/src/aintegral.cpp +++ b/aintegral2/src/aintegral.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -29,6 +30,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/alangop2/src/alangop.cpp b/alangop2/src/alangop.cpp index a2808c7652..52642cea1e 100644 --- a/alangop2/src/alangop.cpp +++ b/alangop2/src/alangop.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -51,6 +52,11 @@ int main(int argc, char* argv[]) { cmd.parse(argc,argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/alib2data/src/common/GlobalData.cpp b/alib2data/src/common/GlobalData.cpp new file mode 100644 index 0000000000..71fd27c699 --- /dev/null +++ b/alib2data/src/common/GlobalData.cpp @@ -0,0 +1,16 @@ +/* + * GlobalData.cpp + * + * Created on: 9. 2. 2014 + * Author: Jan Travnicek + */ + +#include "GlobalData.h" + +namespace common { + +bool GlobalData::verbose = false; + +bool GlobalData::measure = false; + +} /* common */ diff --git a/alib2data/src/common/GlobalData.h b/alib2data/src/common/GlobalData.h new file mode 100644 index 0000000000..178ca3facb --- /dev/null +++ b/alib2data/src/common/GlobalData.h @@ -0,0 +1,22 @@ +/* + * GlobalData.h + * + * Created on: 9. 2. 2014 + * Author: Jan Travnicek + */ + +#ifndef _GLOBAL_DATAH_ +#define _GLOBAL_DATAH_ + +namespace common { + +class GlobalData { +public: + static bool verbose; + static bool measure; + +}; + +} /* common */ + +#endif /* _GLOBAL_DATAH_ */ diff --git a/alphabetManip2/src/alphabetManip.cpp b/alphabetManip2/src/alphabetManip.cpp index 7bc7f265a3..e53c459501 100644 --- a/alphabetManip2/src/alphabetManip.cpp +++ b/alphabetManip2/src/alphabetManip.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -78,6 +79,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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 ); diff --git a/aminimize2/src/aminimize.cpp b/aminimize2/src/aminimize.cpp index 430faf5993..c67a8d9aa7 100644 --- a/aminimize2/src/aminimize.cpp +++ b/aminimize2/src/aminimize.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -34,6 +35,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/anormalize2/src/anormalize.cpp b/anormalize2/src/anormalize.cpp index f7626cead5..93e04c98da 100644 --- a/anormalize2/src/anormalize.cpp +++ b/anormalize2/src/anormalize.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -51,6 +52,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/arand2/src/arand.cpp b/arand2/src/arand.cpp index 206c781726..ac10f296ed 100644 --- a/arand2/src/arand.cpp +++ b/arand2/src/arand.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <factory/XmlDataFactory.hpp> #include "automaton/generate/RandomAutomatonFactory.h" @@ -70,6 +71,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + if(measure.isSet()) + common::GlobalData::measure = true; + std::chrono::measurements::start ( "Overal", std::chrono::measurements::Type::OVERALL ); if ( !type.isSet ( ) ) throw exception::AlibException ( "Type is not defined." ); diff --git a/araw2/src/araw.cpp b/araw2/src/araw.cpp index 85f41ce5ba..8bd6393a97 100644 --- a/araw2/src/araw.cpp +++ b/araw2/src/araw.cpp @@ -6,6 +6,7 @@ **/ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <string> #include <exception/AlibException.h> #include <RawApi.hpp> @@ -47,6 +48,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/arename2/src/arename.cpp b/arename2/src/arename.cpp index 34d69a3bd8..8805678a33 100644 --- a/arename2/src/arename.cpp +++ b/arename2/src/arename.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -27,6 +28,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/areverse2/src/areverse.cpp b/areverse2/src/areverse.cpp index da282230ee..9718a8b7ac 100644 --- a/areverse2/src/areverse.cpp +++ b/areverse2/src/areverse.cpp @@ -5,8 +5,9 @@ * Author: Tomas Pecka */ -#include <iostream> #include <tclap/CmdLine.h> +#include <common/GlobalData.h> +#include <iostream> #include "exception/AlibException.h" #include "factory/XmlDataFactory.hpp" @@ -28,6 +29,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/arun2/src/arun.cpp b/arun2/src/arun.cpp index f5616d6fc5..93a6ba3e57 100644 --- a/arun2/src/arun.cpp +++ b/arun2/src/arun.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -49,6 +50,11 @@ int main(int argc, char* argv[]) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/astat2/src/astat.cpp b/astat2/src/astat.cpp index d4794cd3b0..a626482d08 100644 --- a/astat2/src/astat.cpp +++ b/astat2/src/astat.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -116,6 +117,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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 ); diff --git a/astringology2/src/astringology.cpp b/astringology2/src/astringology.cpp index 6832635765..ff4de1725c 100644 --- a/astringology2/src/astringology.cpp +++ b/astringology2/src/astringology.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <vector> #include <factory/XmlDataFactory.hpp> @@ -63,6 +64,11 @@ int main ( int argc, char * argv[] ) { cmd.parse ( argc, argv ); + if(verbose.isSet()) + common::GlobalData::verbose = true; + if(measure.isSet()) + common::GlobalData::measure = true; + int needPattern = 0; int needSubject = 0; diff --git a/atrim2/src/atrim.cpp b/atrim2/src/atrim.cpp index 66141dc2f1..8408fa23b3 100644 --- a/atrim2/src/atrim.cpp +++ b/atrim2/src/atrim.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <factory/XmlDataFactory.hpp> #include <exception/AlibException.h> @@ -82,6 +83,11 @@ int main(int argc, char* argv[]) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); diff --git a/tniceprint/src/tniceprint.cpp b/tniceprint/src/tniceprint.cpp index 6055e296d9..9ed22a1b46 100644 --- a/tniceprint/src/tniceprint.cpp +++ b/tniceprint/src/tniceprint.cpp @@ -6,6 +6,7 @@ */ #include <tclap/CmdLine.h> +#include <common/GlobalData.h> #include <string> #include <exception/AlibException.h> #include <factory/XmlDataFactory.hpp> @@ -30,6 +31,11 @@ int main(int argc, char** argv) { cmd.parse(argc, argv); + if(verbose.isSet()) + common::GlobalData::verbose = true; + 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); -- GitLab