From dc39bcad8f9a0203967bb34ba0d8e08f0a7b8f19 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 20 Dec 2017 20:49:17 +0100 Subject: [PATCH] update includes in algo_experimental --- .../src/automaton/RandomAutomatonFactory2.h | 8 ++++---- .../src/grammar/parsing/AbsorbTerminalSymbol.h | 4 ++-- .../src/grammar/parsing/DeterministicLL1Grammar.cpp | 2 +- .../src/grammar/parsing/DeterministicLL1ParseTable.h | 8 ++++---- .../src/grammar/parsing/ExtractRightContext.h | 2 +- alib2algo_experimental/src/grammar/parsing/First.h | 6 +++--- alib2algo_experimental/src/grammar/parsing/Follow.h | 10 +++++----- .../src/grammar/parsing/HandleFirstFirstConflict.h | 2 +- .../src/grammar/parsing/HandleFirstFollowConflict.h | 4 ++-- .../src/grammar/parsing/LL1ParseTable.h | 8 ++++---- alib2algo_experimental/src/grammar/parsing/LRParser.h | 2 +- .../src/grammar/parsing/common/Substitute.h | 2 +- .../src/graph/datastructs/Components.h | 2 +- .../src/graph/embedding/HopcroftTarjan.cpp | 4 ++-- .../src/graph/generate/RandomGraphFactory.cpp | 8 ++++---- .../src/graph/isomorphism/HopcroftGraph.cpp | 4 ++-- .../src/graph/isomorphism/HopcroftGraph.h | 2 +- .../src/graph/isomorphism/HopcroftImpl.cpp | 6 +++--- .../src/graph/isomorphism/HopcroftImpl.h | 6 +++--- .../src/graph/maximumflow/FordFulkerson.cpp | 4 ++-- .../src/graph/maximumflow/FordFulkerson.h | 2 +- .../src/graph/minimumcut/FordFulkerson.cpp | 7 ++++--- .../src/graph/shortestpath/BellmanFord.h | 2 +- .../src/graph/shortestpath/Dijkstra.h | 2 +- .../src/graph/shortestpath/FloydWarshall.h | 2 +- .../src/graph/sort/TopologicalSort.h | 2 +- .../src/graph/spanningtree/Edmonds.cpp | 4 ++-- .../src/graph/spanningtree/Kruskal.cpp | 6 +++--- alib2algo_experimental/src/graph/traverse/Bfs.cpp | 2 +- alib2algo_experimental/src/graph/traverse/Dfs.cpp | 2 +- .../test-src/grammar/parsing/LR0Parser.cpp | 2 +- .../test-src/grammar/parsing/LRParser.cpp | 2 +- .../test-src/grammar/parsing/SLR1ParseTable.cpp | 4 ++-- alib2algo_experimental/test-src/graph/TestUtils.cpp | 2 +- alib2algo_experimental/test-src/graph/TestUtils.h | 6 +++--- .../test-src/graph/isomorphism/HopcroftTest.cpp | 2 +- .../test-src/graph/minimumcut/FordFulkersonTest.cpp | 2 +- .../test-src/graph/spanningtree/JarnikPrimTest.cpp | 2 +- .../test-src/graph/traverse/BfsTest.cpp | 2 +- 39 files changed, 75 insertions(+), 74 deletions(-) diff --git a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h index 766b7177ae..c50c113f66 100644 --- a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h +++ b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.h @@ -8,10 +8,10 @@ #ifndef RANDOM_AUTOMATON_FACTORY_2_H_ #define RANDOM_AUTOMATON_FACTORY_2_H_ -#include <deque> -#include <set> -#include <algorithm> -#include <random> +#include <alib/deque> +#include <alib/set> +#include <alib/algorithm> +#include <alib/random> #include <exception/CommonException.h> diff --git a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h index a3185f7803..6ac109e685 100644 --- a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h +++ b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h @@ -10,8 +10,8 @@ #include <grammar/GrammarFeatures.h> #include <alphabet/Symbol.h> -#include <set> -#include <map> +#include <alib/set> +#include <alib/map> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp index 7cf3d9faeb..1ced2810c9 100644 --- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp +++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp @@ -12,7 +12,7 @@ #include <grammar/ContextFree/CFG.h> #include <exception/CommonException.h> -#include <algorithm> +#include <alib/algorithm> #include <grammar/properties/RecursiveNonterminal.h> #include <registration/AlgoRegistration.hpp> diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h index db91d72106..de905ce1fe 100644 --- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h +++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h @@ -10,10 +10,10 @@ #include <alphabet/Symbol.h> #include <string/Epsilon.h> -#include <vector> -#include <variant> -#include <set> -#include <map> +#include <alib/vector> +#include <alib/variant> +#include <alib/set> +#include <alib/map> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h index c3bceebd5f..7821f5c04c 100644 --- a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h +++ b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h @@ -10,7 +10,7 @@ #include <grammar/GrammarFeatures.h> #include <alphabet/Symbol.h> -#include <set> +#include <alib/set> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/First.h b/alib2algo_experimental/src/grammar/parsing/First.h index 1cbb577d80..8b24a2ace3 100644 --- a/alib2algo_experimental/src/grammar/parsing/First.h +++ b/alib2algo_experimental/src/grammar/parsing/First.h @@ -8,9 +8,9 @@ #ifndef FIRST_H_ #define FIRST_H_ -#include <vector> -#include <set> -#include <variant> +#include <alib/vector> +#include <alib/set> +#include <alib/variant> #include <string/Epsilon.h> #include <grammar/Grammar.h> diff --git a/alib2algo_experimental/src/grammar/parsing/Follow.h b/alib2algo_experimental/src/grammar/parsing/Follow.h index 10f9d9a79f..341b1e006e 100644 --- a/alib2algo_experimental/src/grammar/parsing/Follow.h +++ b/alib2algo_experimental/src/grammar/parsing/Follow.h @@ -8,11 +8,11 @@ #ifndef FOLLOW_H_ #define FOLLOW_H_ -#include <vector> -#include <set> -#include <variant> -#include <algorithm> -#include <iterator> +#include <alib/vector> +#include <alib/set> +#include <alib/variant> +#include <alib/algorithm> +#include <alib/iterator> #include <exception/CommonException.h> diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h index fc95695835..cfc6dc16ad 100644 --- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h +++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h @@ -10,7 +10,7 @@ #include <grammar/GrammarFeatures.h> #include <alphabet/Symbol.h> -#include <vector> +#include <alib/vector> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h index 31b6ce228f..02eb3611fe 100644 --- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h +++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h @@ -10,8 +10,8 @@ #include <grammar/GrammarFeatures.h> #include <alphabet/Symbol.h> -#include <vector> -#include <set> +#include <alib/vector> +#include <alib/set> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h index 56601ef507..ef2120525c 100644 --- a/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h +++ b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h @@ -8,10 +8,10 @@ #ifndef LL_1_PARSE_TABLE_H_ #define LL_1_PARSE_TABLE_H_ -#include <vector> -#include <variant> -#include <set> -#include <map> +#include <alib/vector> +#include <alib/variant> +#include <alib/set> +#include <alib/map> #include <grammar/Grammar.h> #include <string/Epsilon.h> diff --git a/alib2algo_experimental/src/grammar/parsing/LRParser.h b/alib2algo_experimental/src/grammar/parsing/LRParser.h index 48e0f3f7a1..f759a6f7e5 100644 --- a/alib2algo_experimental/src/grammar/parsing/LRParser.h +++ b/alib2algo_experimental/src/grammar/parsing/LRParser.h @@ -12,7 +12,7 @@ #include <grammar/ContextFree/CFG.h> #include <grammar/parsing/LRParserTypes.h> -#include <vector> +#include <alib/vector> namespace grammar { diff --git a/alib2algo_experimental/src/grammar/parsing/common/Substitute.h b/alib2algo_experimental/src/grammar/parsing/common/Substitute.h index f6a9ac46e4..2799e225fa 100644 --- a/alib2algo_experimental/src/grammar/parsing/common/Substitute.h +++ b/alib2algo_experimental/src/grammar/parsing/common/Substitute.h @@ -10,7 +10,7 @@ #include <grammar/GrammarFeatures.h> #include <alphabet/Symbol.h> -#include <vector> +#include <alib/vector> namespace grammar { diff --git a/alib2algo_experimental/src/graph/datastructs/Components.h b/alib2algo_experimental/src/graph/datastructs/Components.h index c3564e4ab4..aa72e087f6 100644 --- a/alib2algo_experimental/src/graph/datastructs/Components.h +++ b/alib2algo_experimental/src/graph/datastructs/Components.h @@ -5,7 +5,7 @@ * Author: Jan Broz */ -#include <unordered_map> +#include <alib/unordered_map> #include <graph/common/Node.h> diff --git a/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp b/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp index 202f6f3d15..55fd35f6da 100644 --- a/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp +++ b/alib2algo_experimental/src/graph/embedding/HopcroftTarjan.cpp @@ -7,9 +7,9 @@ #include "HopcroftTarjan.h" -#include <list> +#include <alib/list> #include <stack> -#include <algorithm> +#include <alib/algorithm> #include <exception/CommonException.h> diff --git a/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp b/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp index 888c711261..64bc8b2726 100644 --- a/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp +++ b/alib2algo_experimental/src/graph/generate/RandomGraphFactory.cpp @@ -8,10 +8,10 @@ #include "RandomGraphFactory.h" -#include <random> -#include <algorithm> -#include <unordered_map> -#include <iostream> +#include <alib/random> +#include <alib/algorithm> +#include <alib/unordered_map> +#include <alib/iostream> #include <sstream> #include "../datastructs/Array.h" diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp index 8c0a4c7563..145fc9c880 100644 --- a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp +++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.cpp @@ -8,11 +8,11 @@ #include "HopcroftGraph.h" #include "HopcroftDebug.h" -#include <algorithm> +#include <alib/algorithm> #include <exception/CommonException.h> -#include <iostream> +#include <alib/iostream> namespace graph { diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h index 0eb92a9a09..9b3ef2618a 100644 --- a/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h +++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftGraph.h @@ -8,7 +8,7 @@ #ifndef GRAPH_HOPCROFT_GRAPH_H_ #define GRAPH_HOPCROFT_GRAPH_H_ -#include <vector> +#include <alib/vector> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp index ac9d4d6573..2ca9d017bc 100644 --- a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp +++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.cpp @@ -8,9 +8,9 @@ #include "HopcroftImpl.h" #include "HopcroftDebug.h" -#include <tuple> -#include <iostream> -#include <algorithm> +#include <alib/tuple> +#include <alib/iostream> +#include <alib/algorithm> #include <exception/CommonException.h> diff --git a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h index 9a283628b5..167503b73b 100644 --- a/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h +++ b/alib2algo_experimental/src/graph/isomorphism/HopcroftImpl.h @@ -8,9 +8,9 @@ #ifndef GRAPH_HOPCROFT_IMPL_H_ #define GRAPH_HOPCROFT_IMPL_H_ -#include <list> -#include <vector> -#include <unordered_map> +#include <alib/list> +#include <alib/vector> +#include <alib/unordered_map> #include "HopcroftGraph.h" diff --git a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp index 26ab8ccb59..90ca375a2b 100644 --- a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp +++ b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.cpp @@ -7,9 +7,9 @@ #include "FordFulkerson.h" -#include <unordered_map> +#include <alib/unordered_map> #include <queue> -#include <string> +#include <alib/string> #include <sstream> #include <climits> #include <stdexcept> diff --git a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h index 4a40f8b4f3..5ebee61093 100644 --- a/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h +++ b/alib2algo_experimental/src/graph/maximumflow/FordFulkerson.h @@ -8,7 +8,7 @@ #ifndef FORD_FULKERSON #define FORD_FULKERSON -#include <unordered_map> +#include <alib/unordered_map> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp b/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp index bf5c723188..1bf93fe7ad 100644 --- a/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp +++ b/alib2algo_experimental/src/graph/minimumcut/FordFulkerson.cpp @@ -7,18 +7,20 @@ #include "FordFulkerson.h" -#include <unordered_map> #include <unordered_set> // return value +#include <unordered_map> // return value #include <vector> // removed edges #include <queue> // BFS -#include <utility> +#include <alib/utility> #include <exception/CommonException.h> #include "../maximumflow/FordFulkerson.h" #include <registration/AlgoRegistration.hpp> +#include <alib/iostream> + namespace graph { namespace minimumcut { @@ -116,7 +118,6 @@ static Cut fordfulkerson_impl_dir( const DirectedGraph & graph, Node source, Nod return cut; } -#include <iostream> static Cut fordfulkerson_impl_undir( const UndirectedGraph & ugraph, Node source, Node sink ) { Cut cut; diff --git a/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h b/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h index 8ae2affeff..e648115535 100644 --- a/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h +++ b/alib2algo_experimental/src/graph/shortestpath/BellmanFord.h @@ -8,7 +8,7 @@ #ifndef GRAPH_BELLMAN_FORD_H_ #define GRAPH_BELLMAN_FORD_H_ -#include <unordered_map> +#include <alib/unordered_map> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h b/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h index 14b1540139..0215e50bec 100644 --- a/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h +++ b/alib2algo_experimental/src/graph/shortestpath/Dijkstra.h @@ -8,7 +8,7 @@ #ifndef GRAPH_DIJKSTRA_H_ #define GRAPH_DIJKSTRA_H_ -#include <unordered_map> +#include <alib/unordered_map> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h b/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h index 240f76350c..b90ef95de9 100644 --- a/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h +++ b/alib2algo_experimental/src/graph/shortestpath/FloydWarshall.h @@ -8,7 +8,7 @@ #ifndef GRAPH_FLOYD_WARSHALL_FORD_H_ #define GRAPH_FLOYD_WARSHALL_FORD_H_ -#include <unordered_map> +#include <alib/unordered_map> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/sort/TopologicalSort.h b/alib2algo_experimental/src/graph/sort/TopologicalSort.h index b1ccd2fc9a..cb99850c3d 100644 --- a/alib2algo_experimental/src/graph/sort/TopologicalSort.h +++ b/alib2algo_experimental/src/graph/sort/TopologicalSort.h @@ -8,7 +8,7 @@ #ifndef GRAPH_TOPOLOGICAL_SORT_H_ #define GRAPH_TOPOLOGICAL_SORT_H_ -#include <list> +#include <alib/list> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp b/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp index b84ac36ee2..6a80c94bc0 100644 --- a/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp +++ b/alib2algo_experimental/src/graph/spanningtree/Edmonds.cpp @@ -7,8 +7,8 @@ #include "Edmonds.h" -#include <vector> -#include <list> +#include <alib/vector> +#include <alib/list> #include <queue> #include <climits> #include <stdexcept> diff --git a/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp b/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp index b6c263db7a..a012915a61 100644 --- a/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp +++ b/alib2algo_experimental/src/graph/spanningtree/Kruskal.cpp @@ -7,9 +7,9 @@ #include "Kruskal.h" -#include <vector> -#include <unordered_map> -#include <algorithm> +#include <alib/vector> +#include <alib/unordered_map> +#include <alib/algorithm> #include <stdexcept> #include "../datastructs/Components.h" diff --git a/alib2algo_experimental/src/graph/traverse/Bfs.cpp b/alib2algo_experimental/src/graph/traverse/Bfs.cpp index 628cba2225..cadcd947d8 100644 --- a/alib2algo_experimental/src/graph/traverse/Bfs.cpp +++ b/alib2algo_experimental/src/graph/traverse/Bfs.cpp @@ -8,7 +8,7 @@ #include "Bfs.h" #include <queue> -#include <unordered_map> +#include <alib/unordered_map> #include <registration/AlgoRegistration.hpp> namespace graph { diff --git a/alib2algo_experimental/src/graph/traverse/Dfs.cpp b/alib2algo_experimental/src/graph/traverse/Dfs.cpp index 95ae205f09..b3fa49bda8 100644 --- a/alib2algo_experimental/src/graph/traverse/Dfs.cpp +++ b/alib2algo_experimental/src/graph/traverse/Dfs.cpp @@ -8,7 +8,7 @@ #include "Dfs.h" #include <stack> -#include <unordered_map> +#include <alib/unordered_map> #include <registration/AlgoRegistration.hpp> namespace graph { diff --git a/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp index da5f4833ee..ed9f3b0e1b 100644 --- a/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp +++ b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp @@ -5,7 +5,7 @@ #include <label/LR0ItemsLabel.h> -#include <vector> +#include <alib/vector> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( LR0Parser, "grammar" ); CPPUNIT_TEST_SUITE_REGISTRATION ( LR0Parser ); diff --git a/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp index 2932d56688..1921562740 100644 --- a/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp +++ b/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp @@ -5,7 +5,7 @@ #include <label/LR0ItemsLabel.h> -#include <vector> +#include <alib/vector> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( LRParser, "grammar" ); CPPUNIT_TEST_SUITE_REGISTRATION ( LRParser ); diff --git a/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp index 5f9709bd4f..ac24ce337a 100644 --- a/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp +++ b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp @@ -5,8 +5,8 @@ #include <label/LR0ItemsLabel.h> -#include <variant> -#include <vector> +#include <alib/variant> +#include <alib/vector> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SLR1ParseTable, "grammar" ); CPPUNIT_TEST_SUITE_REGISTRATION ( SLR1ParseTable ); diff --git a/alib2algo_experimental/test-src/graph/TestUtils.cpp b/alib2algo_experimental/test-src/graph/TestUtils.cpp index be562038d6..43d431ec66 100644 --- a/alib2algo_experimental/test-src/graph/TestUtils.cpp +++ b/alib2algo_experimental/test-src/graph/TestUtils.cpp @@ -1,6 +1,6 @@ #include "TestUtils.h" -#include <unordered_map> +#include <alib/unordered_map> void printGraphData( const graph::DirectedGraph & graph ) { diff --git a/alib2algo_experimental/test-src/graph/TestUtils.h b/alib2algo_experimental/test-src/graph/TestUtils.h index ad56d57698..33f1092348 100644 --- a/alib2algo_experimental/test-src/graph/TestUtils.h +++ b/alib2algo_experimental/test-src/graph/TestUtils.h @@ -2,11 +2,11 @@ #define TEST_UTILS_H #include <cstdio> -#include <string> +#include <alib/string> #include <sstream> -#include <vector> -#include <unordered_map> +#include <alib/vector> +#include <alib/unordered_map> #include <graph/GraphClasses.h> diff --git a/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp b/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp index c33c7cbb96..794d1e7adb 100644 --- a/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp +++ b/alib2algo_experimental/test-src/graph/isomorphism/HopcroftTest.cpp @@ -1,6 +1,6 @@ #include "HopcroftTest.h" -#include <algorithm> +#include <alib/algorithm> #include "graph/isomorphism/HopcroftImpl.h" #include "graph/embedding/HopcroftTarjan.h" diff --git a/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp b/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp index eb4d626613..4adb30a320 100644 --- a/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp +++ b/alib2algo_experimental/test-src/graph/minimumcut/FordFulkersonTest.cpp @@ -2,7 +2,7 @@ #include <graph/minimumcut/FordFulkerson.h> -#include <utility> +#include <alib/utility> #include <exception/CommonException.h> diff --git a/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp b/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp index 4540e5fef4..f085f8c519 100644 --- a/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp +++ b/alib2algo_experimental/test-src/graph/spanningtree/JarnikPrimTest.cpp @@ -2,7 +2,7 @@ #include "graph/spanningtree/JarnikPrim.h" -#include <iostream> +#include <alib/iostream> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphJarnikPrimTest, "graph" ); CPPUNIT_TEST_SUITE_REGISTRATION( GraphJarnikPrimTest ); diff --git a/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp b/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp index 95863eecc3..b15a58d1f2 100644 --- a/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp +++ b/alib2algo_experimental/test-src/graph/traverse/BfsTest.cpp @@ -2,7 +2,7 @@ #include "graph/traverse/Bfs.h" -#include <unordered_map> +#include <alib/unordered_map> CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphBfsTest, "graph" ); CPPUNIT_TEST_SUITE_REGISTRATION( GraphBfsTest ); -- GitLab