Benchmark and optimization (#223)

* Squashed commit of the following: commit 83f90d5ba5856f695cba8c764c8e021ad42ec2fc Author: ZigRazor <[email protected]> Date: Fri Sep 9 09:47:48 2022 +0000 Include Correction Signed-off-by: ZigRazor <[email protected]> commit f5321cd473949c6fabb3bc7aae5e02cf60515793 Author: ZigRazor <[email protected]> Date: Fri Sep 9 09:44:03 2022 +0000 Removed large file storage Signed-off-by: ZigRazor <[email protected]> commit 21a91340546b289d33558325d31b29de4ede7d5b Author: ZigRazor <[email protected]> Date: Fri Sep 9 09:36:37 2022 +0000 Added git large files storage (lfs) for dataset Signed-off-by: ZigRazor <[email protected]> commit d0b1c64710b7aca9c4dbb352b71e5f489e08c744 Author: ZigRazor <[email protected]> Date: Fri Sep 9 09:30:25 2022 +0000 Upgraded Node Constructor Added Unordered_Set for NodeSet Signed-off-by: ZigRazor <[email protected]> Signed-off-by: ZigRazor <[email protected]> * Added benchmark for all, and tested Signed-off-by: ZigRazor <[email protected]> Signed-off-by: ZigRazor <[email protected]>
ZigRazor · Oct 5, 2022 · d9f9d59 · d9f9d59
1 parent 1235fd0
commit d9f9d59
Show file tree

Hide file tree

Showing 45 changed files with 755 additions and 188 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git 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);
+BENCHMARK(BFS_FromReadedCitHep);
+
diff --git a/benchmark/BellmanFord_BM.cpp b/benchmark/BellmanFord_BM.cpp
@@ -0,0 +1,34 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void BellmanFord_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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);
diff --git a/benchmark/Boruvka_BM.cpp b/benchmark/Boruvka_BM.cpp
@@ -0,0 +1,34 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void Boruvka_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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);
diff --git a/benchmark/Connectivity_BM.cpp b/benchmark/Connectivity_BM.cpp
@@ -0,0 +1,64 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void Connectivity_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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);
diff --git a/benchmark/CycleCheck_BM.cpp b/benchmark/CycleCheck_BM.cpp
@@ -0,0 +1,64 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void CycleCheckBFS_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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);
diff --git 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);
+BENCHMARK(DFS_FromReadedCitHep);
+
diff --git a/benchmark/Dial_BM.cpp b/benchmark/Dial_BM.cpp
@@ -0,0 +1,33 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+static void Dial_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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);
diff --git a/benchmark/Dijkstra_BM.cpp b/benchmark/Dijkstra_BM.cpp
@@ -0,0 +1,35 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void Dijkstra_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = edges.begin();
+    auto range_end = edges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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
@@ -0,0 +1,22 @@
+#include <benchmark/benchmark.h>
+#include "CXXGraph.hpp"
+#include "Utilities.hpp"
+
+
+static void EulerPath_X(benchmark::State &state)
+{
+    CXXGRAPH::Graph<int> g;
+    auto range_start = undirectedEdges.begin();
+    auto range_end = undirectedEdges.find(state.range(0));
+    std::unordered_map<unsigned long, CXXGRAPH::Edge<int> *> 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
@@ -16,7 +16,7 @@ static void BM_FWDirected(benchmark::State &state)
     CXXGRAPH::DirectedWeightedEdge<int> edge4(4, node4, node2, -1);
     CXXGRAPH::DirectedWeightedEdge<int> edge5(3, node2, node3, 3);
 
-    std::set<const CXXGRAPH::Edge<int> *> edgeSet;
+    CXXGRAPH::T_EdgeSet<int> edgeSet;
     edgeSet.insert(&edge1);
     edgeSet.insert(&edge2);
     edgeSet.insert(&edge3);
@@ -40,7 +40,7 @@ static void BM_FWNegCycle(benchmark::State &state)
     CXXGRAPH::DirectedWeightedEdge<int> edge1(1, node0, node1, 2);
     CXXGRAPH::DirectedWeightedEdge<int> edge2(2, node1, node2, 3);
     CXXGRAPH::DirectedWeightedEdge<int> edge3(3, node2, node0, -7);
-    std::set<const CXXGRAPH::Edge<int> *> edgeSet;
+    CXXGRAPH::T_EdgeSet<int> edgeSet;
     edgeSet.insert(&edge1);
     edgeSet.insert(&edge2);
     edgeSet.insert(&edge3);
@@ -61,7 +61,7 @@ static void BM_FWUndirectedWeighted(benchmark::State &state)
     CXXGRAPH::DirectedWeightedEdge<int> edge1(1, pairNode, 1);
     CXXGRAPH::DirectedWeightedEdge<int> edge2(2, node2, node3, 1);
     CXXGRAPH::UndirectedWeightedEdge<int> edge3(3, node1, node3, 6);
-    std::set<const CXXGRAPH::Edge<int> *> edgeSet;
+    CXXGRAPH::T_EdgeSet<int> edgeSet;
     edgeSet.insert(&edge1);
     edgeSet.insert(&edge2);
     edgeSet.insert(&edge3);
@@ -82,7 +82,7 @@ static void BM_FWNoWeighted(benchmark::State &state)
     CXXGRAPH::DirectedWeightedEdge<int> edge1(1, pairNode, 1);
     CXXGRAPH::DirectedWeightedEdge<int> edge2(2, node2, node3, 1);
     CXXGRAPH::DirectedEdge<int> edge3(3, node1, node3);
-    std::set<const CXXGRAPH::Edge<int> *> edgeSet;
+    CXXGRAPH::T_EdgeSet<int> edgeSet;
     edgeSet.insert(&edge1);
     edgeSet.insert(&edge2);
     edgeSet.insert(&edge3);