diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..e69de29bb diff --git a/benchmark/BFS_BM.cpp b/benchmark/BFS_BM.cpp index 7a0e5ce64..53190eb02 100644 --- a/benchmark/BFS_BM.cpp +++ b/benchmark/BFS_BM.cpp @@ -2,9 +2,6 @@ #include "CXXGraph.hpp" #include "Utilities.hpp" -static auto nodes = generateRandomNodes(100000, 2); -static auto edges = generateRandomEdges(100000, nodes); -static auto graph_ptr = readGraph("CitHepPh"); static void BFS_X(benchmark::State &state) { @@ -26,12 +23,13 @@ BENCHMARK(BFS_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 static void BFS_FromReadedCitHep(benchmark::State &state) { - auto edgeSet = graph_ptr->getEdgeSet(); + auto edgeSet = cit_graph_ptr->getEdgeSet(); for (auto _ : state) { - auto &result = graph_ptr->breadth_first_search(*((*(edgeSet.begin()))->getNodePair().first)); + auto &result = cit_graph_ptr->breadth_first_search(*((*(edgeSet.begin()))->getNodePair().first)); } } -BENCHMARK(BFS_FromReadedCitHep); \ No newline at end of file +BENCHMARK(BFS_FromReadedCitHep); + diff --git a/benchmark/BellmanFord_BM.cpp b/benchmark/BellmanFord_BM.cpp new file mode 100644 index 000000000..db5f67023 --- /dev/null +++ b/benchmark/BellmanFord_BM.cpp @@ -0,0 +1,34 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void BellmanFord_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.bellmanford(*(range_start->second->getNodePair().first), *(range_end->second->getNodePair().second)); + } +} +BENCHMARK(BellmanFord_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void BellmanFord_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->bellmanford(*((*(edgeSet.begin()))->getNodePair().first), *((*(++edgeSet.begin()))->getNodePair().second)); + } +} + +BENCHMARK(BellmanFord_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Boruvka_BM.cpp b/benchmark/Boruvka_BM.cpp new file mode 100644 index 000000000..0bf78d829 --- /dev/null +++ b/benchmark/Boruvka_BM.cpp @@ -0,0 +1,34 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void Boruvka_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.boruvka(); + } +} +BENCHMARK(Boruvka_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Boruvka_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->boruvka(); + } +} + +BENCHMARK(Boruvka_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Connectivity_BM.cpp b/benchmark/Connectivity_BM.cpp new file mode 100644 index 000000000..edf2142ae --- /dev/null +++ b/benchmark/Connectivity_BM.cpp @@ -0,0 +1,64 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void Connectivity_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.isConnectedGraph(); + } +} +BENCHMARK(Connectivity_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Connectivity_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->isConnectedGraph(); + } +} + +BENCHMARK(Connectivity_FromReadedCitHep); + +static void StrongConnectivity_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.isConnectedGraph(); + } +} +BENCHMARK(StrongConnectivity_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void StrongConnectivity_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->isConnectedGraph(); + } +} + +BENCHMARK(StrongConnectivity_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/CycleCheck_BM.cpp b/benchmark/CycleCheck_BM.cpp new file mode 100644 index 000000000..831f1b96f --- /dev/null +++ b/benchmark/CycleCheck_BM.cpp @@ -0,0 +1,64 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void CycleCheckBFS_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.isCyclicDirectedGraphBFS(); + } +} +BENCHMARK(CycleCheckBFS_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void CycleCheckBFS_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->isCyclicDirectedGraphBFS(); + } +} + +BENCHMARK(CycleCheckBFS_FromReadedCitHep); + +static void CycleCheckDFS_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.isCyclicDirectedGraphDFS(); + } +} +BENCHMARK(CycleCheckDFS_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void CycleCheckDFS_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->isCyclicDirectedGraphDFS(); + } +} + +BENCHMARK(CycleCheckDFS_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/DFS_BM.cpp b/benchmark/DFS_BM.cpp index a66c89925..808f625f7 100644 --- a/benchmark/DFS_BM.cpp +++ b/benchmark/DFS_BM.cpp @@ -2,9 +2,6 @@ #include "CXXGraph.hpp" #include "Utilities.hpp" -static auto nodes = generateRandomNodes(100000, 2); -static auto edges = generateRandomEdges(100000, nodes); -static auto graph_ptr = readGraph("CitHepPh"); static void DFS_X(benchmark::State &state) { @@ -28,12 +25,13 @@ BENCHMARK(DFS_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 static void DFS_FromReadedCitHep(benchmark::State &state) { - auto edgeSet = graph_ptr->getEdgeSet(); + auto edgeSet = cit_graph_ptr->getEdgeSet(); for (auto _ : state) { - auto &result = graph_ptr->depth_first_search(*((*(edgeSet.begin()))->getNodePair().first)); + auto &result = cit_graph_ptr->depth_first_search(*((*(edgeSet.begin()))->getNodePair().first)); } } -BENCHMARK(DFS_FromReadedCitHep); \ No newline at end of file +BENCHMARK(DFS_FromReadedCitHep); + diff --git a/benchmark/Dial_BM.cpp b/benchmark/Dial_BM.cpp new file mode 100644 index 000000000..635415fb2 --- /dev/null +++ b/benchmark/Dial_BM.cpp @@ -0,0 +1,33 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + +static void Dial_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.dial(*(range_start->second->getNodePair().first),1); + } +} +BENCHMARK(Dial_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Dial_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->dial(*((*(edgeSet.begin()))->getNodePair().first), 1); + } +} + +BENCHMARK(Dial_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Dijkstra_BM.cpp b/benchmark/Dijkstra_BM.cpp new file mode 100644 index 000000000..8c3e766da --- /dev/null +++ b/benchmark/Dijkstra_BM.cpp @@ -0,0 +1,35 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void Dijkstra_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.dijkstra(*(range_start->second->getNodePair().first), *(range_end->second->getNodePair().second)); + } +} +BENCHMARK(Dijkstra_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Dijkstra_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->dijkstra(*((*(edgeSet.begin()))->getNodePair().first),*((*(++edgeSet.begin()))->getNodePair().second)); + } +} + +BENCHMARK(Dijkstra_FromReadedCitHep); + diff --git a/benchmark/EulerPath_BM.cpp b/benchmark/EulerPath_BM.cpp new file mode 100644 index 000000000..e7e0e7213 --- /dev/null +++ b/benchmark/EulerPath_BM.cpp @@ -0,0 +1,22 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void EulerPath_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = undirectedEdges.begin(); + auto range_end = undirectedEdges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.eulerianPath(); + } +} +BENCHMARK(EulerPath_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); diff --git a/benchmark/FloydWarshall_BM.cpp b/benchmark/FloydWarshall_BM.cpp index 40985ac4d..e774a65b5 100644 --- a/benchmark/FloydWarshall_BM.cpp +++ b/benchmark/FloydWarshall_BM.cpp @@ -16,7 +16,7 @@ static void BM_FWDirected(benchmark::State &state) CXXGRAPH::DirectedWeightedEdge edge4(4, node4, node2, -1); CXXGRAPH::DirectedWeightedEdge edge5(3, node2, node3, 3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -40,7 +40,7 @@ static void BM_FWNegCycle(benchmark::State &state) CXXGRAPH::DirectedWeightedEdge edge1(1, node0, node1, 2); CXXGRAPH::DirectedWeightedEdge edge2(2, node1, node2, 3); CXXGRAPH::DirectedWeightedEdge edge3(3, node2, node0, -7); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -61,7 +61,7 @@ static void BM_FWUndirectedWeighted(benchmark::State &state) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -82,7 +82,7 @@ static void BM_FWNoWeighted(benchmark::State &state) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/benchmark/FordFulkerson_BM.cpp b/benchmark/FordFulkerson_BM.cpp new file mode 100644 index 000000000..2a69c47a7 --- /dev/null +++ b/benchmark/FordFulkerson_BM.cpp @@ -0,0 +1,34 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void FordFulkerson_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.fordFulkersonMaxFlow(*(range_start->second->getNodePair().first), *(range_end->second->getNodePair().second)); + } +} +BENCHMARK(FordFulkerson_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void FordFulkerson_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->fordFulkersonMaxFlow(*((*(edgeSet.begin()))->getNodePair().first), *((*(++edgeSet.begin()))->getNodePair().second)); + } +} + +BENCHMARK(FordFulkerson_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/GraphSlicing_BM.cpp b/benchmark/GraphSlicing_BM.cpp new file mode 100644 index 000000000..8b120f15f --- /dev/null +++ b/benchmark/GraphSlicing_BM.cpp @@ -0,0 +1,22 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void GraphSlicing_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.graph_slicing(*(range_start->second->getNodePair().first)); + } +} +BENCHMARK(GraphSlicing_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 12); diff --git a/benchmark/Graph_BM.cpp b/benchmark/Graph_BM.cpp index ec783f328..65ece6938 100644 --- a/benchmark/Graph_BM.cpp +++ b/benchmark/Graph_BM.cpp @@ -3,11 +3,7 @@ #include "CXXGraph.hpp" #include "Utilities.hpp" -static auto nodes = generateRandomNodes(100000, 2); -static auto edges = generateRandomEdges(100000, nodes); -static auto undirectedEdges = generateRandomUndirectedEdges(100000, nodes); - -static CXXGRAPH::Graph *graph; +//static CXXGRAPH::Graph *graph; static void GraphCreation(benchmark::State &state) { @@ -139,6 +135,17 @@ static void getAdjMatrixX(benchmark::State &state) BENCHMARK(getAdjMatrixX)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); +static void readCitHep(benchmark::State &state) +{ + + for (auto _ : state) + { + auto g = readGraph("CitHepPh"); + } +} + +BENCHMARK(readCitHep); + static void getAdjMatrixCitHep(benchmark::State &state) { auto g = readGraph("CitHepPh"); @@ -149,3 +156,6 @@ static void getAdjMatrixCitHep(benchmark::State &state) } BENCHMARK(getAdjMatrixCitHep); + + + diff --git a/benchmark/Kruskal_BM.cpp b/benchmark/Kruskal_BM.cpp new file mode 100644 index 000000000..804ceda50 --- /dev/null +++ b/benchmark/Kruskal_BM.cpp @@ -0,0 +1,34 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void Kruskal_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.kruskal(); + } +} +BENCHMARK(Kruskal_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Kruskal_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->kruskal(); + } +} + +BENCHMARK(Kruskal_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Partition_BM.cpp b/benchmark/Partition_BM.cpp new file mode 100644 index 000000000..bdfc68eb7 --- /dev/null +++ b/benchmark/Partition_BM.cpp @@ -0,0 +1,124 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void PartitionHDRF_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001); + } +} +BENCHMARK(PartitionHDRF_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void PartitionHDRF_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001); + } +} + +BENCHMARK(PartitionHDRF_FromReadedCitHep); + +static void PartitionEBVC_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4); + } +} +BENCHMARK(PartitionEBVC_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void PartitionEBVC_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4); + } +} + +BENCHMARK(PartitionEBVC_FromReadedCitHep); + +static void PartitionGVC_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::GREEDY_VC_ALG, 4); + } +} +BENCHMARK(PartitionGVC_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void PartitionGVC_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::GREEDY_VC_ALG, 4); + } +} + +BENCHMARK(PartitionGVC_FromReadedCitHep); + +static void PartitionEBV_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto result = g.partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::EBV_ALG, 4, 1, 1); + } +} +BENCHMARK(PartitionEBV_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void PartitionEBV_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto result = cit_graph_ptr->partitionGraph(CXXGRAPH::PARTITIONING::PartitionAlgorithm::EBV_ALG, 4, 1, 1); + } +} + +BENCHMARK(PartitionEBV_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Prim_BM.cpp b/benchmark/Prim_BM.cpp new file mode 100644 index 000000000..de9c8cf37 --- /dev/null +++ b/benchmark/Prim_BM.cpp @@ -0,0 +1,34 @@ +#include +#include "CXXGraph.hpp" +#include "Utilities.hpp" + + +static void Prim_X(benchmark::State &state) +{ + CXXGRAPH::Graph g; + auto range_start = edges.begin(); + auto range_end = edges.find(state.range(0)); + std::unordered_map *> edgesX; + edgesX.insert(range_start, range_end); + for (auto e : edgesX) + { + g.addEdge(&(*e.second)); + } + for (auto _ : state) + { + auto &result = g.prim(); + } +} +BENCHMARK(Prim_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 16); + +static void Prim_FromReadedCitHep(benchmark::State &state) +{ + auto edgeSet = cit_graph_ptr->getEdgeSet(); + for (auto _ : state) + { + + auto &result = cit_graph_ptr->prim(); + } +} + +BENCHMARK(Prim_FromReadedCitHep); \ No newline at end of file diff --git a/benchmark/Utilities.hpp b/benchmark/Utilities.hpp index bdcbd10b6..b32dd7b4d 100644 --- a/benchmark/Utilities.hpp +++ b/benchmark/Utilities.hpp @@ -59,4 +59,11 @@ static CXXGRAPH::Graph *readGraph(const std::string &filename) return graph_ptr; } +//Static Generation + +static auto nodes = generateRandomNodes(100000, 2); +static auto edges = generateRandomEdges(100000, nodes); +static auto undirectedEdges = generateRandomUndirectedEdges(100000, nodes); +static auto cit_graph_ptr = readGraph("CitHepPh"); + #endif // __UTILITIES_H__ diff --git a/benchmark/dataset/README.md b/benchmark/dataset/README.md index 3852e1c6f..b521fbd6e 100644 --- a/benchmark/dataset/README.md +++ b/benchmark/dataset/README.md @@ -4,7 +4,7 @@ In this README are reported all the datasets used in the benchmark and their cit ## CitHepPh - []: # Path: benchmark/dataset/cithep/README.md + []: # Path: benchmark/dataset/CitHepPh.csv - J. Leskovec, J. Kleinberg and C. Faloutsos. [Graphs over Time: Densification Laws, Shrinking Diameters and Possible Explanations](http://www.cs.cmu.edu/~jure/pubs/powergrowth-kdd05.pdf). ACM SIGKDD International Conference on Knowledge Discovery and Data Mining (KDD), 2005. -- J. Gehrke, P. Ginsparg, J. M. Kleinberg. [Overview of the 2003 KDD Cup](http://www.cs.cornell.edu/home/kleinber/kddcup2003.pdf). SIGKDD Explorations 5(2): 149-151, 2003. \ No newline at end of file +- J. Gehrke, P. Ginsparg, J. M. Kleinberg. [Overview of the 2003 KDD Cup](http://www.cs.cornell.edu/home/kleinber/kddcup2003.pdf). SIGKDD Explorations 5(2): 149-151, 2003. diff --git a/examples/DialExample/dial_example.cpp b/examples/DialExample/dial_example.cpp index cf1659c2e..9d250921d 100644 --- a/examples/DialExample/dial_example.cpp +++ b/examples/DialExample/dial_example.cpp @@ -36,7 +36,7 @@ int main() { CXXGRAPH::DirectedWeightedEdge edge4(4, node0, node1, norm(points_vector.at(node0.getData()), points_vector.at(node1.getData()))); CXXGRAPH::DirectedWeightedEdge edge5(5, node0, node2, norm(points_vector.at(node0.getData()), points_vector.at(node2.getData()))); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/examples/DijkstraExample/dijkstra_example.cpp b/examples/DijkstraExample/dijkstra_example.cpp index 7e01c203d..597992107 100644 --- a/examples/DijkstraExample/dijkstra_example.cpp +++ b/examples/DijkstraExample/dijkstra_example.cpp @@ -12,7 +12,7 @@ int main() { CXXGRAPH::UndirectedWeightedEdge edge4(4, node0, node3, 1.0); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/include/Graph/Graph.hpp b/include/Graph/Graph.hpp index 18a766fd1..c5f6ee783 100644 --- a/include/Graph/Graph.hpp +++ b/include/Graph/Graph.hpp @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -62,8 +63,17 @@ #include "Partitioning/Partitioner.hpp" #include "Partitioning/Utility/Globals.hpp" + + + namespace CXXGRAPH { + //Typedef for Allocator + //typedef size_t DataType; + //typedef Moya::Allocator *,16* 1024> MemoryPoolAllocator; + template + using T_EdgeSet = std::unordered_set *>; + namespace PARTITIONING { template @@ -80,7 +90,7 @@ namespace CXXGRAPH class Graph { private: - std::set *> edgeSet = {}; + T_EdgeSet edgeSet = {}; std::optional> getExtenstionAndSeparator(InputOutputFormat format) const; int writeToStandardFile(const std::string &workingDir, const std::string &OFileName, bool compress, bool writeNodeFeat, bool writeEdgeWeight, InputOutputFormat format) const; int readFromStandardFile(const std::string &workingDir, const std::string &OFileName, bool compress, bool readNodeFeat, bool readEdgeWeight, InputOutputFormat format); @@ -90,7 +100,7 @@ namespace CXXGRAPH public: Graph() = default; - Graph(const std::set *> &edgeSet); + Graph(const T_EdgeSet &edgeSet); virtual ~Graph() = default; /** * \brief @@ -100,7 +110,7 @@ namespace CXXGRAPH * @returns a list of Edges of the graph * */ - virtual const std::set *> &getEdgeSet() const; + virtual const T_EdgeSet &getEdgeSet() const; /** * \brief * Function set the Edge Set of the Graph @@ -109,7 +119,7 @@ namespace CXXGRAPH * @param edgeSet The Edge Set * */ - virtual void setEdgeSet(std::set *> &edgeSet); + virtual void setEdgeSet(T_EdgeSet &edgeSet); /** * \brief * Function add an Edge to the Graph Edge Set @@ -294,7 +304,7 @@ namespace CXXGRAPH * * @return true if a cycle is detected, else false */ - virtual bool containsCycle(const std::set *> *) const; + virtual bool containsCycle(const T_EdgeSet *) const; /** * @brief * This function checks if the given Subset @@ -302,7 +312,7 @@ namespace CXXGRAPH * * @return true if a cycle is detected, else false */ - virtual bool containsCycle(const std::set *> *edgeSet, std::unordered_map *) const; + virtual bool containsCycle(const T_EdgeSet *edgeSet, std::unordered_map *) const; /** * \brief @@ -454,7 +464,7 @@ namespace CXXGRAPH }; template - Graph::Graph(const std::set *> &edgeSet) + Graph::Graph(const T_EdgeSet &edgeSet) { for (const auto &edgeSetIt : edgeSet) { @@ -470,13 +480,13 @@ namespace CXXGRAPH } template - const std::set *> &Graph::getEdgeSet() const + const T_EdgeSet &Graph::getEdgeSet() const { return edgeSet; } template - void Graph::setEdgeSet(std::set *> &edgeSet) + void Graph::setEdgeSet(T_EdgeSet &edgeSet) { this->edgeSet.clear(); for (const auto &edgeSetIt : edgeSet) @@ -1719,7 +1729,7 @@ namespace CXXGRAPH } template - bool Graph::containsCycle(const std::set *> *edgeSet) const + bool Graph::containsCycle(const T_EdgeSet *edgeSet) const { std::unordered_map subset; // initialize the subset parent and rank values @@ -1747,7 +1757,7 @@ namespace CXXGRAPH } template - bool Graph::containsCycle(const std::set *> *edgeSet, std::unordered_map *subset) const + bool Graph::containsCycle(const T_EdgeSet *edgeSet, std::unordered_map *subset) const { for (const auto &edge : *edgeSet) { @@ -2398,7 +2408,7 @@ namespace CXXGRAPH } else { - // OUTPUT FORMAT NOT RECOGNIZED + // INPUT FORMAT NOT RECOGNIZED result = -1; } } diff --git a/include/Node/Node.hpp b/include/Node/Node.hpp index f621859b7..31899d02b 100644 --- a/include/Node/Node.hpp +++ b/include/Node/Node.hpp @@ -37,15 +37,15 @@ namespace CXXGRAPH class Node { private: - unsigned long long id = 0; + std::size_t id = 0; std::string userId = ""; T data; - void setId(const std::string*); + void setId(std::string_view); public: - Node(const std::string, const T &data); + Node(std::string_view, const T &data); ~Node() = default; - const unsigned long long &getId() const; + const std::size_t &getId() const; const std::string &getUserId() const; const T &getData() const; //operator @@ -55,20 +55,22 @@ namespace CXXGRAPH }; template - Node::Node(const std::string id, const T &data) + Node::Node(std::string_view id, const T &data) { this->userId = id; // the userid is set as sha512 hash of the user provided id - setId(&id); + setId(id); this->data = data; } template - void Node::setId(const std::string* inpId) + void Node::setId(std::string_view inpId) { - const unsigned char* userId = reinterpret_cast((*inpId).c_str() ); - unsigned char obuf[64]; - SHA512(userId, (*inpId).length(), obuf); + //const unsigned char* userId = reinterpret_cast((*inpId).c_str() ); + //unsigned char obuf[64]; + //unsigned long long obuf[8]; + //SHA512(userId, (*inpId).length(), reinterpret_cast(obuf)); + /** // Transform byte-array to string std::stringstream shastr; shastr << std::hex << std::setfill('0'); @@ -84,10 +86,14 @@ namespace CXXGRAPH // convert hex string to unsigned long long std::istringstream iss(idStr); iss >> std::hex >> this->id; + + **/ + this->id = std::hash{}(inpId); + } template - const unsigned long long &Node::getId() const + const std::size_t &Node::getId() const { return id; } diff --git a/include/Partitioning/EBV.hpp b/include/Partitioning/EBV.hpp index 715f9212b..ae3d6a1e3 100644 --- a/include/Partitioning/EBV.hpp +++ b/include/Partitioning/EBV.hpp @@ -110,8 +110,8 @@ namespace CXXGRAPH std::map eva; auto u_partition = u_record->getPartitions(); auto v_partition = v_record->getPartitions(); - auto optimalEdgesNumber = edgeCardinality / P; - auto optimalVerticesNumber = vertexCardinality / P; + auto optimalEdgesNumber = (double)edgeCardinality / (double)P; + auto optimalVerticesNumber = (double)vertexCardinality / (double)P; for (int i = 0; i < P; i++) { eva[i] = 0; diff --git a/include/Partitioning/Partition.hpp b/include/Partitioning/Partition.hpp index 5cae9f026..87b3da3ce 100644 --- a/include/Partitioning/Partition.hpp +++ b/include/Partitioning/Partition.hpp @@ -23,6 +23,7 @@ #pragma once #include +#include #include "Utility/Typedef.hpp" #include "PartitioningStats.hpp" @@ -31,6 +32,9 @@ namespace CXXGRAPH { template class Graph; + + template + using T_EdgeSet = std::unordered_set *>; namespace PARTITIONING { template @@ -42,8 +46,8 @@ namespace CXXGRAPH public: Partition(); Partition(unsigned int partitionId); - Partition(const std::set *> &edgeSet); - Partition(unsigned int partitionId, const std::set *> &edgeSet); + Partition(const T_EdgeSet &edgeSet); + Partition(unsigned int partitionId, const T_EdgeSet &edgeSet); ~Partition() = default; /** * @brief Get the Partition ID @@ -165,13 +169,13 @@ namespace CXXGRAPH } template - Partition::Partition(const std::set *> &edgeSet) : Graph(edgeSet) + Partition::Partition(const T_EdgeSet &edgeSet) : Graph(edgeSet) { partitionId = 0; } template - Partition::Partition(unsigned int partitionId, const std::set *> &edgeSet) : Graph(edgeSet) + Partition::Partition(unsigned int partitionId, const T_EdgeSet &edgeSet) : Graph(edgeSet) { this->partitionId = partitionId; } @@ -268,11 +272,11 @@ namespace CXXGRAPH unsigned int getNumberOfEdges(const PartitionMap &partitionMap) { unsigned int numberOfEdges = 0; - std::set *> edgeSet; + T_EdgeSet edgeSet; for (const auto& it : partitionMap) { - const std::set *> partitionEdgeSet = it.second->getEdgeSet(); + const T_EdgeSet partitionEdgeSet = it.second->getEdgeSet(); for (const auto& it2 : partitionEdgeSet) { if (std::find_if(edgeSet.begin(), edgeSet.end(), [it2](const Edge *edge) diff --git a/include/Partitioning/Partitioner.hpp b/include/Partitioning/Partitioner.hpp index 64fa4ad22..4c5d26a18 100644 --- a/include/Partitioning/Partitioner.hpp +++ b/include/Partitioning/Partitioner.hpp @@ -42,7 +42,7 @@ namespace CXXGRAPH class Partitioner { private: - std::set *> dataset = {}; + T_EdgeSet dataset = {}; PartitionStrategy* algorithm = nullptr; Globals GLOBALS; @@ -50,14 +50,14 @@ namespace CXXGRAPH public: - Partitioner(const std::set *> &dataset, Globals &G); + Partitioner(const T_EdgeSet &dataset, Globals &G); Partitioner(const Partitioner& other); ~Partitioner(); CoordinatedPartitionState performCoordinatedPartition(); }; template - Partitioner::Partitioner(const std::set *> &dataset, Globals &G) : GLOBALS(G) + Partitioner::Partitioner(const T_EdgeSet &dataset, Globals &G) : GLOBALS(G) { //this->GLOBALS = G; this->dataset = dataset; diff --git a/test/BFSTest.cpp b/test/BFSTest.cpp index 61f9d70d3..02b631b3d 100644 --- a/test/BFSTest.cpp +++ b/test/BFSTest.cpp @@ -10,7 +10,7 @@ TEST(BFSTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -32,7 +32,7 @@ TEST(BFSTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -54,7 +54,7 @@ TEST(BFSTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -75,7 +75,7 @@ TEST(BFSTest, test_4) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -97,7 +97,7 @@ TEST(BFSTest, test_5) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -120,7 +120,7 @@ TEST(BFSTest, test_6) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/BellmanFordTest.cpp b/test/BellmanFordTest.cpp index 90afa81cf..18397627f 100644 --- a/test/BellmanFordTest.cpp +++ b/test/BellmanFordTest.cpp @@ -25,7 +25,7 @@ TEST(BellmanFordTest, test_1) CXXGRAPH::DirectedWeightedEdge edge9(1, node3, node0, 2); CXXGRAPH::DirectedWeightedEdge edge10(1, node4, node1, -2); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -54,7 +54,7 @@ TEST(BellmanFordTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, node0, node1, 2); CXXGRAPH::DirectedWeightedEdge edge2(2, node1, node2, 3); CXXGRAPH::DirectedWeightedEdge edge3(3, node2, node0, -7); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -77,7 +77,7 @@ TEST(BellmanFordTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -100,7 +100,7 @@ TEST(BellmanFordTest, test_4) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -123,7 +123,7 @@ TEST(BellmanFordTest, test_5) CXXGRAPH::Node node2("2", 2); CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge1(2, node1, node2, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); CXXGRAPH::Graph graph(edgeSet); CXXGRAPH::BellmanFordResult res = graph.bellmanford(node3, node1); diff --git a/test/BoruvkaTest.cpp b/test/BoruvkaTest.cpp index b5a0893a5..4d60639d8 100644 --- a/test/BoruvkaTest.cpp +++ b/test/BoruvkaTest.cpp @@ -34,7 +34,7 @@ TEST(BoruvkaTest, test_1) CXXGRAPH::UndirectedWeightedEdge edge13(13, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(14, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -84,7 +84,7 @@ TEST(BoruvkaTest, test_2) CXXGRAPH::UndirectedWeightedEdge edge8(8, node5, node4, 22); CXXGRAPH::UndirectedWeightedEdge edge9(9, node4, node3, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -130,7 +130,7 @@ TEST(BoruvkaTest, test_3) CXXGRAPH::UndirectedWeightedEdge edge11(11, node5, node6, 3); CXXGRAPH::UndirectedWeightedEdge edge12(12, node6, node7, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -161,7 +161,7 @@ TEST(BoruvkaTest, test_4) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge1(1, node1, node2, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); @@ -171,7 +171,7 @@ TEST(BoruvkaTest, test_4) ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIR_GRAPH); CXXGRAPH::UndirectedEdge edge3(3, node1, node2); - std::set *> edgeSet1; + CXXGRAPH::T_EdgeSet edgeSet1; edgeSet1.insert(&edge3); CXXGRAPH::Graph graph1(edgeSet1); diff --git a/test/ConnectivityTest.cpp b/test/ConnectivityTest.cpp index c2c22feaa..e537b048c 100644 --- a/test/ConnectivityTest.cpp +++ b/test/ConnectivityTest.cpp @@ -28,7 +28,7 @@ TEST(ConnectivityTest, test_1) CXXGRAPH::UndirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -76,7 +76,7 @@ TEST(ConnectivityTest, test_2) CXXGRAPH::UndirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -132,7 +132,7 @@ TEST(ConnectivityTest, test_3) CXXGRAPH::DirectedWeightedEdge edge21(3, node7, node0, 10); CXXGRAPH::DirectedWeightedEdge edge22(3, node8, node0, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -188,7 +188,7 @@ TEST(ConnectivityTest, test_4) CXXGRAPH::DirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::DirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -238,7 +238,7 @@ TEST(ConnectivityTest, test_5) CXXGRAPH::UndirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -294,7 +294,7 @@ TEST(ConnectivityTest, test_6) CXXGRAPH::DirectedWeightedEdge edge20(3, node6, node0, 10); CXXGRAPH::DirectedWeightedEdge edge21(3, node7, node0, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -347,7 +347,7 @@ TEST(ConnectivityTest, test_7) CXXGRAPH::UndirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -403,7 +403,7 @@ TEST(ConnectivityTest, test_8) CXXGRAPH::DirectedWeightedEdge edge21(3, node7, node0, 10); CXXGRAPH::DirectedWeightedEdge edge22(3, node8, node0, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/CycleCheckTest.cpp b/test/CycleCheckTest.cpp index 056d9b070..84e1840d5 100644 --- a/test/CycleCheckTest.cpp +++ b/test/CycleCheckTest.cpp @@ -10,7 +10,7 @@ TEST(CycleCheckTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -27,7 +27,7 @@ TEST(CycleCheckTest, test_2) std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); CXXGRAPH::Graph graph(edgeSet); @@ -44,7 +44,7 @@ TEST(CycleCheckTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -62,7 +62,7 @@ TEST(CycleCheckTest, test_4) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -80,7 +80,7 @@ TEST(CycleCheckTest, test_5) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -97,7 +97,7 @@ TEST(CycleCheckTest, test_6) std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); CXXGRAPH::Graph graph(edgeSet); @@ -114,7 +114,7 @@ TEST(CycleCheckTest, test_7) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -132,7 +132,7 @@ TEST(CycleCheckTest, test_8) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node3, node1, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/DFSTest.cpp b/test/DFSTest.cpp index a3b681eac..9062893d4 100644 --- a/test/DFSTest.cpp +++ b/test/DFSTest.cpp @@ -10,7 +10,7 @@ TEST(DFSTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -31,7 +31,7 @@ TEST(DFSTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -52,7 +52,7 @@ TEST(DFSTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -73,7 +73,7 @@ TEST(DFSTest, test_4) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -94,7 +94,7 @@ TEST(DFSTest, test_5) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -116,7 +116,7 @@ TEST(DFSTest, test_6) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/DialTest.cpp b/test/DialTest.cpp index 4e78321ff..c8aa0dd51 100644 --- a/test/DialTest.cpp +++ b/test/DialTest.cpp @@ -10,7 +10,7 @@ TEST(DialTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -32,7 +32,7 @@ TEST(DialTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -55,7 +55,7 @@ TEST(DialTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -73,7 +73,7 @@ TEST(DialTest, test_4) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -93,7 +93,7 @@ TEST(DialTest, test_5) CXXGRAPH::Node node4("4", 4); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); diff --git a/test/DijkstraTest.cpp b/test/DijkstraTest.cpp index 72b87d5eb..8f599a9e4 100644 --- a/test/DijkstraTest.cpp +++ b/test/DijkstraTest.cpp @@ -12,7 +12,7 @@ TEST(DijkstraTest, correct_example_1) CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -35,7 +35,7 @@ TEST(DijkstraTest, correct_example_2) CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -64,7 +64,7 @@ TEST(DijkstraTest, correct_example_3) CXXGRAPH::UndirectedWeightedEdge edge6(6, nodeB, nodeD, 5); CXXGRAPH::UndirectedWeightedEdge edge7(7, nodeD, nodeE, 7); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -113,7 +113,7 @@ TEST(DijkstraTest, correct_example_4) CXXGRAPH::UndirectedWeightedEdge edge8(8, node4, node6, 2); CXXGRAPH::UndirectedWeightedEdge edge9(9, node5, node6, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -172,7 +172,7 @@ TEST(DijkstraTest, correct_example_5) CXXGRAPH::UndirectedWeightedEdge edge8(8, node4, node5, 6); CXXGRAPH::UndirectedWeightedEdge edge9(9, node6, node5, 9); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -202,7 +202,7 @@ TEST(DijkstraTest, non_weigthed_node_test) CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -226,7 +226,7 @@ TEST(DijkstraTest, negative_weigthed_node_test) CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 5); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -248,7 +248,7 @@ TEST(DijkstraTest, unreachable_node_test) CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -270,7 +270,7 @@ TEST(DijkstraTest, source_not_connected_test) CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -292,7 +292,7 @@ TEST(DijkstraTest, target_not_connected_test) CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/EdgeTest.cpp b/test/EdgeTest.cpp index 14abc111a..17530d6af 100644 --- a/test/EdgeTest.cpp +++ b/test/EdgeTest.cpp @@ -40,7 +40,7 @@ TEST(EdgeTest, test) CXXGRAPH::UndirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/EulerPathTest.cpp b/test/EulerPathTest.cpp index f55075290..0c9b94281 100644 --- a/test/EulerPathTest.cpp +++ b/test/EulerPathTest.cpp @@ -16,7 +16,7 @@ TEST(EulerPathTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, node0, node1, 4); CXXGRAPH::DirectedWeightedEdge edge2(2, node1, node2, 8); CXXGRAPH::DirectedWeightedEdge edge3(3, node2, node0, 11); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -49,7 +49,7 @@ TEST(EulerPathTest, test_2) CXXGRAPH::DirectedWeightedEdge edge5(5, node3, node4, 11); CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node1, 11); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -89,7 +89,7 @@ TEST(EulerPathTest, test_3) CXXGRAPH::DirectedEdge edge7(6, node5, node0); CXXGRAPH::DirectedEdge edge8(6, node6, node4); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/FWTest.cpp b/test/FWTest.cpp index 7016bb7f0..15cf102df 100644 --- a/test/FWTest.cpp +++ b/test/FWTest.cpp @@ -16,7 +16,7 @@ TEST(FWTest, test_1) CXXGRAPH::DirectedWeightedEdge edge4(4, node4, node2, -1); CXXGRAPH::DirectedWeightedEdge edge5(3, node2, node3, 3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -63,7 +63,7 @@ TEST(FWTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, node0, node1, 2); CXXGRAPH::DirectedWeightedEdge edge2(2, node1, node2, 3); CXXGRAPH::DirectedWeightedEdge edge3(3, node2, node0, -7); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -85,7 +85,7 @@ TEST(FWTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -107,7 +107,7 @@ TEST(FWTest, test_4) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/FordFulkersonTest.cpp b/test/FordFulkersonTest.cpp index 9cf4fdfbe..116ab4ee1 100644 --- a/test/FordFulkersonTest.cpp +++ b/test/FordFulkersonTest.cpp @@ -18,7 +18,7 @@ TEST(FordFulkersonTest, test_1) CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node3, 7); CXXGRAPH::DirectedWeightedEdge edge7(7, node4, node5, 4); CXXGRAPH::DirectedWeightedEdge edge8(8, node3, node5, 19); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -50,7 +50,7 @@ TEST(FordFulkersonTest, test_2) CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node3, 7); CXXGRAPH::DirectedWeightedEdge edge7(7, node4, node5, 4); CXXGRAPH::DirectedWeightedEdge edge8(8, node3, node5, 19); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -82,7 +82,7 @@ TEST(FordFulkersonTest, test_3) CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node3, 7); CXXGRAPH::DirectedWeightedEdge edge7(7, node4, node5, 4); CXXGRAPH::DirectedWeightedEdge edge8(8, node3, node5, 4); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -114,7 +114,7 @@ TEST(FordFulkersonTest, test_4) CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node3, 7); CXXGRAPH::DirectedEdge edge7(7, node4, node5); CXXGRAPH::DirectedWeightedEdge edge8(8, node3, node5, 4); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/GraphSlicingTest.cpp b/test/GraphSlicingTest.cpp index 5f44e874f..9271fba64 100644 --- a/test/GraphSlicingTest.cpp +++ b/test/GraphSlicingTest.cpp @@ -18,7 +18,7 @@ TEST(GraphSlicingTest, test_1) CXXGRAPH::DirectedEdge edge5(5, node3, node6); CXXGRAPH::DirectedEdge edge6(6, node4, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -53,7 +53,7 @@ TEST(GraphSlicingTest, test_2) CXXGRAPH::DirectedWeightedEdge edge5(5, node3, node6, 8); CXXGRAPH::DirectedWeightedEdge edge6(6, node4, node3, 0); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -87,7 +87,7 @@ TEST(GraphSlicingTest, test_3) CXXGRAPH::UndirectedEdge edge5(5, node3, node6); CXXGRAPH::UndirectedEdge edge6(6, node4, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -119,7 +119,7 @@ TEST(GraphSlicingTest, test_4) CXXGRAPH::UndirectedWeightedEdge edge5(5, node3, node6, 8); CXXGRAPH::UndirectedWeightedEdge edge6(6, node4, node3, 0); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -143,7 +143,7 @@ TEST(GraphSlicingTest, test_5) CXXGRAPH::DirectedWeightedEdge edge1(1, node1, node2, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::DirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/GraphTest.cpp b/test/GraphTest.cpp index b2f7d1135..698e83f2a 100644 --- a/test/GraphTest.cpp +++ b/test/GraphTest.cpp @@ -7,7 +7,7 @@ TEST(GraphTest, Constructor_1) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); ASSERT_EQ(graph.getEdgeSet(), edgeSet); @@ -19,7 +19,7 @@ TEST(GraphTest, GetEdge_1) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); ASSERT_FALSE(graph.getEdge(2).has_value()); @@ -31,7 +31,7 @@ TEST(GraphTest, GetEdge_2) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); ASSERT_TRUE(graph.getEdge(1).has_value()); @@ -43,7 +43,7 @@ TEST(GraphTest, GetEdge_3) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); ASSERT_EQ(*(graph.getEdge(1).value()), edge); @@ -55,7 +55,7 @@ TEST(GraphTest, GetNodeSet_1) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); auto nodeSet = graph.getNodeSet(); @@ -72,7 +72,7 @@ TEST(GraphTest, GetNodeSet_2) std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); CXXGRAPH::UndirectedEdge edge2(2, node2, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); edgeSet.insert(&edge2); CXXGRAPH::Graph graph(edgeSet); @@ -89,7 +89,7 @@ TEST(GraphTest, adj_print_1) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::Edge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); std::cout << "Test Print Adjacency Matrix" << std::endl; @@ -102,7 +102,7 @@ TEST(GraphTest, adj_print_2) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::DirectedEdge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); std::cout << "Test Print Adjacency Matrix" << std::endl; @@ -115,7 +115,7 @@ TEST(GraphTest, adj_print_3) CXXGRAPH::Node node2("2", 2); std::pair *, const CXXGRAPH::Node *> pairNode(&node1, &node2); CXXGRAPH::UndirectedEdge edge(1, pairNode); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge); CXXGRAPH::Graph graph(edgeSet); std::cout << "Test Print Adjacency Matrix" << std::endl; @@ -131,7 +131,7 @@ TEST(GraphTest, adj_print_4) CXXGRAPH::UndirectedEdge edge1(1, pairNode); CXXGRAPH::UndirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -149,7 +149,7 @@ TEST(GraphTest, adj_print_5) CXXGRAPH::DirectedEdge edge1(1, pairNode); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::DirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -167,7 +167,7 @@ TEST(GraphTest, adj_print_6) CXXGRAPH::DirectedEdge edge1(1, pairNode); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedEdge edge3(3, node1, node3); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/KruskalTest.cpp b/test/KruskalTest.cpp index 09ced4f96..98084f608 100644 --- a/test/KruskalTest.cpp +++ b/test/KruskalTest.cpp @@ -34,7 +34,7 @@ TEST(KruskalTest, test_1) CXXGRAPH::UndirectedWeightedEdge edge13(13, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(14, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -84,7 +84,7 @@ TEST(KruskalTest, test_2) CXXGRAPH::UndirectedWeightedEdge edge8(8, node5, node4, 22); CXXGRAPH::UndirectedWeightedEdge edge9(9, node4, node3, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -129,7 +129,7 @@ TEST(KruskalTest, test_3) CXXGRAPH::UndirectedWeightedEdge edge11(11, node5, node6, 3); CXXGRAPH::UndirectedWeightedEdge edge12(12, node6, node7, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -160,7 +160,7 @@ TEST(KruskalTest, test_4) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge1(1, node1, node2, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); @@ -170,7 +170,7 @@ TEST(KruskalTest, test_4) ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIR_GRAPH); CXXGRAPH::UndirectedEdge edge3(3, node1, node2); - std::set *> edgeSet1; + CXXGRAPH::T_EdgeSet edgeSet1; edgeSet1.insert(&edge3); CXXGRAPH::Graph graph1(edgeSet1); diff --git a/test/PartitionTest.cpp b/test/PartitionTest.cpp index 1c09a5123..20679ed97 100644 --- a/test/PartitionTest.cpp +++ b/test/PartitionTest.cpp @@ -28,7 +28,7 @@ TEST(PartitionTest, test_1) CXXGRAPH::UndirectedWeightedEdge edge10(10, node3, node5, 1); CXXGRAPH::UndirectedWeightedEdge edge11(11, node3, node6, 1); CXXGRAPH::UndirectedWeightedEdge edge12(12, node4, node8, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -103,7 +103,7 @@ TEST(PartitionTest, test_3) CXXGRAPH::UndirectedWeightedEdge edge10(10, node3, node5, 1); CXXGRAPH::UndirectedWeightedEdge edge11(11, node3, node6, 1); CXXGRAPH::UndirectedWeightedEdge edge12(12, node4, node8, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -178,7 +178,7 @@ TEST(PartitionTest, test_5) CXXGRAPH::UndirectedWeightedEdge edge10(10, node3, node5, 1); CXXGRAPH::UndirectedWeightedEdge edge11(11, node3, node6, 1); CXXGRAPH::UndirectedWeightedEdge edge12(12, node4, node8, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -253,7 +253,7 @@ TEST(PartitionTest, test_7) CXXGRAPH::UndirectedWeightedEdge edge10(10, node3, node5, 1); CXXGRAPH::UndirectedWeightedEdge edge11(11, node3, node6, 1); CXXGRAPH::UndirectedWeightedEdge edge12(12, node4, node8, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/PrimTest.cpp b/test/PrimTest.cpp index f2ef13509..abe8fc520 100644 --- a/test/PrimTest.cpp +++ b/test/PrimTest.cpp @@ -34,7 +34,7 @@ TEST(PrimTest, test_1) CXXGRAPH::UndirectedWeightedEdge edge13(3, node3, node5, 14); CXXGRAPH::UndirectedWeightedEdge edge14(3, node5, node4, 10); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -83,7 +83,7 @@ TEST(PrimTest, test_2) CXXGRAPH::UndirectedWeightedEdge edge8(8, node5, node4, 22); CXXGRAPH::UndirectedWeightedEdge edge9(9, node4, node3, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -129,7 +129,7 @@ TEST(PrimTest, test_3) CXXGRAPH::UndirectedWeightedEdge edge11(9, node5, node6, 3); CXXGRAPH::UndirectedWeightedEdge edge12(9, node6, node7, 12); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -160,7 +160,7 @@ TEST(PrimTest, test_4) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge1(1, node1, node2, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); @@ -170,7 +170,7 @@ TEST(PrimTest, test_4) ASSERT_EQ(res.errorMessage, CXXGRAPH::ERR_DIR_GRAPH); CXXGRAPH::UndirectedEdge edge3(3, node1, node2); - std::set *> edgeSet1; + CXXGRAPH::T_EdgeSet edgeSet1; edgeSet1.insert(&edge3); CXXGRAPH::Graph graph1(edgeSet1); diff --git a/test/RWOutputTest.cpp b/test/RWOutputTest.cpp index 4fb52bda6..8ab29e6af 100644 --- a/test/RWOutputTest.cpp +++ b/test/RWOutputTest.cpp @@ -54,7 +54,7 @@ TEST(RWOutputTest, test_1) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -78,7 +78,7 @@ TEST(RWOutputTest, test_2) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -102,7 +102,7 @@ TEST(RWOutputTest, test_3) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -124,7 +124,7 @@ TEST(RWOutputTest, test_4) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -142,7 +142,7 @@ TEST(RWOutputTest, test_5) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -167,7 +167,7 @@ TEST(RWOutputTest, test_6) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -190,7 +190,7 @@ TEST(RWOutputTest, test_7) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -215,7 +215,7 @@ TEST(RWOutputTest, test_8) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -278,7 +278,7 @@ TEST(RWOutputTest, test_9) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -343,7 +343,7 @@ TEST(RWOutputTest, test_10) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -417,7 +417,7 @@ TEST(RWOutputTest, test_11) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 1); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -442,7 +442,7 @@ TEST(RWOutputTest, test_12) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 4); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -466,7 +466,7 @@ TEST(RWOutputTest, test_13) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -488,7 +488,7 @@ TEST(RWOutputTest, test_14) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -506,7 +506,7 @@ TEST(RWOutputTest, test_15) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -531,7 +531,7 @@ TEST(RWOutputTest, test_16) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -554,7 +554,7 @@ TEST(RWOutputTest, test_17) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -579,7 +579,7 @@ TEST(RWOutputTest, test_18) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -642,7 +642,7 @@ TEST(RWOutputTest, test_19) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -707,7 +707,7 @@ TEST(RWOutputTest, test_20) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -777,7 +777,7 @@ TEST(RWOutputTest, test_21) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -805,7 +805,7 @@ TEST(RWOutputTest, test_22) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -882,7 +882,7 @@ TEST(RWOutputTest, test_23) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -906,7 +906,7 @@ TEST(RWOutputTest, test_24) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -934,7 +934,7 @@ TEST(RWOutputTest, test_25) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); @@ -1011,7 +1011,7 @@ TEST(RWOutputTest, test_26) CXXGRAPH::Node node3("3", 3); CXXGRAPH::DirectedWeightedEdge edge2(2, node2, node3, 1); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge2); edgeSet.insert(&edge3); CXXGRAPH::Graph graph(edgeSet); @@ -1030,7 +1030,7 @@ TEST(RWOutputTest, test_26) TEST(RWOutputTest, test_27) { - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; for (const auto& edge : edges) { edgeSet.insert(edge.second); @@ -1062,7 +1062,7 @@ TEST(RWOutputTest, test_28) CXXGRAPH::Node node1("1", 1); CXXGRAPH::Node node2("2", 2); CXXGRAPH::DirectedWeightedEdge edge1(2, node1, node2, 1); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); CXXGRAPH::Graph graph(edgeSet); // force error by writing to a non-existent directory @@ -1089,7 +1089,7 @@ TEST(RWOutputTest, test_29) CXXGRAPH::DirectedWeightedEdge edge1(1, pairNode, 5); CXXGRAPH::DirectedEdge edge2(2, node2, node3); CXXGRAPH::UndirectedWeightedEdge edge3(3, node1, node3, 6); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); edgeSet.insert(&edge2); edgeSet.insert(&edge3); diff --git a/test/UnionFindTest.cpp b/test/UnionFindTest.cpp index 7466fc490..95b1991c8 100644 --- a/test/UnionFindTest.cpp +++ b/test/UnionFindTest.cpp @@ -20,7 +20,7 @@ TEST(UnionFindTest, setFindTest1) // currently we are forced to construct a graph since currently setFind and // setUnion are functions belonging to graph class // can be removed if Subset becomes a class of its own - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); CXXGRAPH::Graph graph(edgeSet); @@ -51,7 +51,7 @@ TEST(UnionFindTest, setFindTest2) subset = { {0, set1}, {1, set2}, {2, set3}, {3, set4}}; CXXGRAPH::UndirectedWeightedEdge edge1(0, node0, node1, 5); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); CXXGRAPH::Graph graph(edgeSet); @@ -79,7 +79,7 @@ TEST(UnionFindTest, setUnionTest3) // setUnion are functions belonging to graph class // can be removed if Subset becomes a class of its own CXXGRAPH::UndirectedWeightedEdge edge1(0, node0, node1, 5); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; edgeSet.insert(&edge1); CXXGRAPH::Graph graph(edgeSet); @@ -99,7 +99,7 @@ TEST(UnionFindTest, containsCycle) CXXGRAPH::Node node1("1", 1); CXXGRAPH::Node node2("2", 2); - std::set *> edgeSet; + CXXGRAPH::T_EdgeSet edgeSet; CXXGRAPH::UndirectedWeightedEdge edge0(0, node0, node1, 5); edgeSet.insert(&edge0);