optimize includes

alib2algo/src/automaton/simplify/UselessStatesRemover.h

@@ -8,7 +8,7 @@
 #ifndef USELESS_STATES_REMOVER_H_
 #define USELESS_STATES_REMOVER_H_
-#include "../properties/UsefullStates.h"
+#include <automaton/properties/UsefullStates.h>
 #include <automaton/FSM/ExtendedNFA.h>
 #include <automaton/FSM/CompactNFA.h>

alib2algo/src/automaton/transform/Compaction.h

@@ -11,8 +11,8 @@
 #include <stack>
 #include <tuple>
-#include "automaton/AutomatonFeatures.h"
 #include <automaton/FSM/CompactNFA.h>
+#include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>
 namespace automaton {

alib2algo/src/automaton/transform/PDAToRHPDA.cpp

@@ -15,8 +15,6 @@
 #include <alphabet/BottomOfTheStackSymbol.h>
 #include <set>
-#include <map>
-#include <queue>
 #include <iterator>
 #include <label/InitialStateLabel.h>
 #include <common/createUnique.hpp>

alib2algo/src/automaton/transform/PDAToRHPDA.h

@@ -8,10 +8,6 @@
 #ifndef PDA_TO_RHPDA_H_
 #define PDA_TO_RHPDA_H_
-#include <algorithm>
-#include <deque>
-#include <set>
-
 #include "automaton/AutomatonFeatures.h"
 namespace automaton {

alib2algo/src/automaton/transform/RHPDAToPDA.cpp

@@ -17,7 +17,6 @@
 #include <set>
 #include <map>
-#include <queue>
 #include <iostream>
 #include <registration/CastRegistration.hpp>

alib2algo/src/automaton/transform/RHPDAToPDA.h

@@ -8,10 +8,6 @@
 #ifndef RHPDA_TO_PDA_H_
 #define RHPDA_TO_PDA_H_
-#include <algorithm>
-#include <deque>
-#include <set>
-
 #include "automaton/AutomatonFeatures.h"
 namespace automaton {

alib2algo/src/automaton/transform/Reverse.h

@@ -8,9 +8,6 @@
 #ifndef REVERSE_H_
 #define REVERSE_H_
-#include <vector>
-#include <algorithm>
-
 #include <automaton/FSM/MultiInitialStateNFA.h>
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>

alib2algo/src/grammar/generate/RandomizeGrammar.h

@@ -8,7 +8,6 @@
 #ifndef GRAMMAR_RANDOMIZE_H_
 #define GRAMMAR_RANDOMIZE_H_
-#include <grammar/Grammar.h>
 #include <grammar/Regular/LeftLG.h>
 #include <grammar/Regular/LeftRG.h>
 #include <grammar/Regular/RightLG.h>

alib2algo/src/grammar/simplify/EpsilonRemover.h

@@ -23,7 +23,7 @@
 #include <grammar/Regular/RightLG.h>
 #include <grammar/Regular/RightRG.h>
-#include "../properties/NullableNonterminals.h"
+#include <grammar/properties/NullableNonterminals.h>
 namespace grammar {

alib2algo/src/grammar/simplify/Rename.cpp

@@ -8,11 +8,7 @@
 #include "Rename.h"
 #include <algorithm>
-#include <deque>
-#include <iostream>
 #include <map>
-#include <set>
-#include <sstream>
 #include <vector>
 #include <hexavigesimal>

alib2algo/src/grammar/simplify/ToCNF.h

@@ -8,9 +8,6 @@
 #ifndef TO_CNF_H_
 #define TO_CNF_H_
-#include <map>
-#include <algorithm>
-
 #include <grammar/ContextFree/CFG.h>
 #include <grammar/ContextFree/EpsilonFreeCFG.h>
 #include <grammar/ContextFree/CNF.h>

alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp

@@ -9,15 +9,14 @@
 #include <set>
 #include <deque>
-#include <queue>
 #include <vector>
+#include <hexavigesimal>
 #include <string/LinearString.h>
-#include <hexavigesimal>
-#include "../transform/RegExpDerivation.h"
-#include "../simplify/RegExpOptimize.h"
-#include "../properties/RegExpEpsilon.h"
+#include <regexp/transform/RegExpDerivation.h>
+#include <regexp/simplify/RegExpOptimize.h>
+#include <regexp/properties/RegExpEpsilon.h>
 #include <registration/AlgoRegistration.hpp>
 namespace regexp {

alib2algo/src/regexp/convert/ToAutomatonGlushkov.cpp

@@ -16,7 +16,7 @@
 #include "../glushkov/GlushkovIndexate.h"
 #include "../glushkov/GlushkovLast.h"
-#include "../properties/RegExpEpsilon.h"
+#include <regexp/properties/RegExpEpsilon.h>
 #include <exception/CommonException.h>
 #include <registration/AlgoRegistration.hpp>

alib2algo/src/regexp/convert/ToAutomatonGlushkov.h

@@ -8,8 +8,6 @@
 #ifndef TO_AUTOMATON_GLUSHKOV_H_
 #define TO_AUTOMATON_GLUSHKOV_H_
-#include <map>
-
 #include <automaton/FSM/NFA.h>
 #include <regexp/formal/FormalRegExp.h>
 #include <regexp/unbounded/UnboundedRegExp.h>

alib2algo/src/regexp/convert/ToAutomatonThompson.cpp

@@ -5,9 +5,8 @@
  *	  Author: Tomas Pecka
  */
 #include "ToAutomatonThompson.h"
-#include "regexp/unbounded/UnboundedRegExpElements.h"
-#include "regexp/formal/FormalRegExpElements.h"
-#include <tuple>
+#include <regexp/unbounded/UnboundedRegExpElements.h>
+#include <regexp/formal/FormalRegExpElements.h>
 #include <registration/AlgoRegistration.hpp>
 namespace regexp {

alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp

@@ -9,15 +9,14 @@
 #include <set>
 #include <deque>
-#include <set>
 #include <vector>
-
 #include <hexavigesimal>
+
 #include <common/createUnique.hpp>
-#include "../simplify/RegExpOptimize.h"
-#include "../transform/RegExpDerivation.h"
-#include "../properties/RegExpEpsilon.h"
+#include <regexp/simplify/RegExpOptimize.h>
+#include <regexp/transform/RegExpDerivation.h>
+#include <regexp/properties/RegExpEpsilon.h>
 #include <registration/AlgoRegistration.hpp>
 namespace regexp {

alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp

@@ -16,10 +16,12 @@
 #include "../glushkov/GlushkovFirst.h"
 #include "../glushkov/GlushkovLast.h"
-#include "../properties/RegExpEpsilon.h"
+#include <regexp/properties/RegExpEpsilon.h>
 #include <exception/CommonException.h>
 #include <registration/AlgoRegistration.hpp>
+#include <container/ObjectsPair.h>
+
 namespace regexp {
 namespace convert {

alib2algo/src/regexp/glushkov/GlushkovIndexate.h

@@ -19,8 +19,6 @@
 #include <regexp/unbounded/UnboundedRegExpIteration.h>
 #include <regexp/unbounded/UnboundedRegExpSymbol.h>
-#include <container/ObjectsPair.h>
-
 namespace regexp {
 /**

alib2algo/src/regexp/simplify/RegExpOptimize.h

@@ -9,7 +9,6 @@
 #define REGEXPOPTIMIZE_H_
 #include <algorithm>
-#include <functional>
 #include <iterator>
 #include <regexp/unbounded/UnboundedRegExp.h>

alib2algo/src/rte/convert/ToPostfixPushdownAutomatonGlushkov.h

@@ -8,15 +8,12 @@
 #ifndef TO_POSTFIX_PUSHDOWN_AUTOMATON_GLUSHKOV_H_
 #define TO_POSTFIX_PUSHDOWN_AUTOMATON_GLUSHKOV_H_
-#include <map>
-
 #include <automaton/PDA/NPDA.h>
 #include <rte/formal/FormalRTE.h>
-#include <container/ObjectsSet.h>
-
 #include <variant>
+#include <set>
 namespace rte {