optimize includes

alib2algo/src/arbology/exact/BoyerMooreHorspool.h

@@ -11,6 +11,8 @@
 #include <set>
 #include <map>
+#include <common/ranked_symbol.hpp>
+
 #include <tree/properties/BadCharacterShiftTable.h>
 #include <tree/properties/SubtreeJumpTable.h>
 #include <tree/properties/ExactSubtreeRepeatsNaive.h>
@@ -18,7 +20,6 @@
 #include <tree/ranked/PrefixRankedBarTree.h>
 #include <tree/ranked/PrefixRankedBarPattern.h>
 #include <tree/ranked/PrefixRankedBarNonlinearPattern.h>
-#include <alphabet/RankedSymbol.h>
 namespace arbology {

alib2algo/src/arbology/exact/DeadZoneUsingBadCharacterShiftAndBorderArray.h

@@ -10,7 +10,9 @@
 #include <set>
 #include <vector>
-#include <alphabet/RankedSymbol.h>
+#include <map>
+
+#include <common/ranked_symbol.hpp>
 #include <tree/properties/ReversedBadCharacterShiftTable.h>
 #include <tree/properties/BorderArrayNaive.h>
@@ -20,9 +22,6 @@
 #include <tree/ranked/PrefixRankedBarPattern.h>
 #include <tree/ranked/PrefixRankedTree.h>
 #include <tree/ranked/PrefixRankedPattern.h>
-#include <alphabet/RankedSymbol.h>
-
-#include <map>
 namespace arbology {

alib2algo/src/arbology/exact/ExactNonlinearTreePatternAutomaton.h

@@ -8,20 +8,17 @@
 #ifndef _EXACT_NONLINEAR_TREE_PATTERN_AUTOMATON_H__
 #define _EXACT_NONLINEAR_TREE_PATTERN_AUTOMATON_H__
-#include <primitive/Unsigned.h>
-#include <primitive/Character.h>
-#include <container/ObjectsPair.h>
-#include <alphabet/RankedSymbol.h>
+#include <pair>
+#include <deque>
+#include <vector>
+#include <common/ranked_symbol.hpp>
 #include <tree/ranked/PrefixRankedTree.h>
 #include <automaton/PDA/InputDrivenNPDA.h>
 #include <tree/properties/ExactSubtreeRepeatsNaive.h>
-#include <deque>
-#include <vector>
-
 namespace arbology {
 namespace exact {

alib2algo/src/arbology/exact/ExactSubtreeMatch.h

@@ -12,8 +12,7 @@
 #include <tree>
 #include <deque>
 #include <foreach>
-
-#include <alphabet/RankedSymbol.h>
+#include <common/ranked_symbol.hpp>
 #include <tree/ranked/RankedTree.h>
 #include <tree/ranked/PrefixRankedTree.h>

alib2algo/src/arbology/exact/ExactTreePatternAutomaton.h

@@ -13,8 +13,6 @@
 #include <automaton/PDA/InputDrivenNPDA.h>
 #include <deque>
-#include <primitive/Character.h>
-#include <primitive/Unsigned.h>
 namespace arbology {

alib2algo/src/arbology/exact/ReversedBoyerMooreHorspool.h

@@ -10,6 +10,7 @@
 #include <set>
 #include <map>
+#include <common/ranked_symbol.hpp>
 #include <tree/properties/ReversedBadCharacterShiftTable.h>
 #include <tree/properties/SubtreeJumpTable.h>
@@ -21,7 +22,6 @@
 #include <tree/ranked/PrefixRankedBarPattern.h>
 #include <tree/ranked/PrefixRankedNonlinearPattern.h>
 #include <tree/ranked/PrefixRankedBarNonlinearPattern.h>
-#include <alphabet/RankedSymbol.h>
 namespace arbology {

alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp

@@ -9,8 +9,8 @@
 #include <exception/CommonException.h>
-#include "alphabet/BottomOfTheStackSymbol.h"
-#include "alphabet/EndSymbol.h"
+#include <alphabet/BottomOfTheStackSymbol.h>
+#include <alphabet/EndSymbol.h>
 #include <label/InitialStateLabel.h>
 #include <label/FinalStateLabel.h>

alib2algo/src/automaton/convert/ToRegExpAlgebraic.cpp

@@ -12,7 +12,7 @@
 #include <automaton/FSM/MultiInitialStateNFA.h>
 #include <automaton/FSM/EpsilonNFA.h>
-#include "../../equations/RightRegularEquationSolver.h"
+#include <equations/RightRegularEquationSolver.h>
 #include <regexp/unbounded/UnboundedRegExpElements.h>
 #include <registration/AlgoRegistration.hpp>

alib2algo/src/automaton/convert/ToRegExpAlgebraic.h

@@ -8,10 +8,6 @@
 #ifndef AUTOMATON_TO_REG_EXP_ALGEBRAIC_H_
 #define AUTOMATON_TO_REG_EXP_ALGEBRAIC_H_
-#include <deque>
-#include <map>
-#include <queue>
-
 #include <regexp/unbounded/UnboundedRegExp.h>
 #include <automaton/AutomatonFeatures.h>

alib2algo/src/automaton/determinize/Determinize.cpp

@@ -6,8 +6,8 @@
  */
 #include "Determinize.h"
-#include "../transform/PDAToRHPDA.h"
-#include "../transform/RHPDAToPDA.h"
+#include <automaton/transform/PDAToRHPDA.h>
+#include <automaton/transform/RHPDAToPDA.h>
 #include <automaton/FSM/DFA.h>
 #include <automaton/FSM/MultiInitialStateNFA.h>
 #include <automaton/PDA/DPDA.h>
@@ -19,7 +19,7 @@
 #include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
 #include <automaton/TM/OneTapeDTM.h>
 #include <automaton/TA/DFTA.h>
-#include "automaton/PDA/RealTimeHeightDeterministicNPDA.h"
+#include <automaton/PDA/RealTimeHeightDeterministicNPDA.h>
 #include <registration/AlgoRegistration.hpp>
 namespace automaton {

alib2algo/src/automaton/determinize/DeterminizeNFAPart.hxx

@@ -11,8 +11,7 @@
 #include <automaton/FSM/MultiInitialStateNFA.h>
 #include <deque>
 #include <algorithm>
-
-#include <container/ObjectsSet.h>
+#include <set>
 namespace automaton {

alib2algo/src/automaton/determinize/common/RHDPDACommon.cpp

 #include "RHDPDACommon.h"
 #include "object/AnyObject.h"
 #include "object/Object.h"
-#include <container/ObjectsPair.h>
-#include <container/ObjectsSet.h>
-
-#include <variant>
 #include "automaton/PDA/VisiblyPushdownNPDA.h"
 #include "automaton/PDA/RealTimeHeightDeterministicNPDA.h"

alib2algo/src/automaton/properties/AllEpsilonClosure.h

@@ -20,7 +20,7 @@
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>
-#include "../../regexp/properties/RegExpEpsilon.h"
+#include <regexp/properties/RegExpEpsilon.h>
 namespace automaton {

alib2algo/src/automaton/properties/EpsilonClosure.h

@@ -20,7 +20,7 @@
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>
-#include "../../regexp/properties/RegExpEpsilon.h"
+#include <regexp/properties/RegExpEpsilon.h>
 namespace automaton {

alib2algo/src/automaton/simplify/EpsilonRemoverIncoming.h

@@ -13,7 +13,7 @@
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>
-#include "../properties/EpsilonClosure.h"
+#include <automaton/properties/EpsilonClosure.h>
 namespace automaton {

alib2algo/src/automaton/simplify/EpsilonRemoverOutgoing.h

@@ -13,7 +13,7 @@
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/DFA.h>
-#include "../properties/EpsilonClosure.h"
+#include <automaton/properties/EpsilonClosure.h>
 namespace automaton {

alib2algo/src/automaton/simplify/MinimizeBrzozowski.h

@@ -12,8 +12,8 @@
 #include <automaton/FSM/NFA.h>
 #include <automaton/FSM/MultiInitialStateNFA.h>
-#include "../transform/Reverse.h"
-#include "../determinize/Determinize.h"
+#include <automaton/transform/Reverse.h>
+#include <automaton/determinize/Determinize.h>
 namespace automaton {

alib2algo/src/automaton/simplify/Rename.cpp

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

alib2algo/src/automaton/simplify/Rename.h

@@ -14,7 +14,6 @@
 #include <automaton/PDA/InputDrivenDPDA.h>
 #include <automaton/PDA/VisiblyPushdownDPDA.h>
 #include <automaton/PDA/RealTimeHeightDeterministicDPDA.h>
-#include <automaton/Automaton.h>
 namespace automaton {

alib2algo/src/automaton/simplify/UnreachableStatesRemover.h

@@ -16,7 +16,7 @@
 #include <automaton/FSM/DFA.h>
 #include <automaton/TA/DFTA.h>
-#include "../properties/ReachableStates.h"
+#include <automaton/properties/ReachableStates.h>
 namespace automaton {