Corrected Memory Leak in Partitioning (#230)

Analized with Valgrind

Fix #229

Signed-off-by: ZigRazor <[email protected]>

Signed-off-by: ZigRazor <[email protected]>

Author: ZigRazor

Diff for: benchmark/GraphSlicing_BM.cpp

@@ -19,4 +19,4 @@ static void GraphSlicing_X(benchmark::State &state)
         auto &result = g.graph_slicing(*(range_start->second->getNodePair().first));
     }
 }
-BENCHMARK(GraphSlicing_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 12);
+BENCHMARK(GraphSlicing_X)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned long)1 << 8);

Diff for: benchmark/Graph_BM.cpp

@@ -50,6 +50,7 @@ static void ReadGraphCitHep(benchmark::State &state)
     for (auto _ : state)
     {
         auto g = readGraph("CitHepPh");
+        delete g;
     }
 }
 
@@ -95,21 +96,19 @@ BENCHMARK(getNodeSetX)->RangeMultiplier(16)->Range((unsigned long)1, (unsigned l
 
 static void getEdgeSetCitHep(benchmark::State &state)
 {
-    auto g = readGraph("CitHepPh");
     for (auto _ : state)
     {
-        auto edgeSet = g->getEdgeSet();
+        auto edgeSet = cit_graph_ptr->getEdgeSet();
     }
 }
 
 BENCHMARK(getEdgeSetCitHep);
 
 static void getNodeSetCitHep(benchmark::State &state)
 {
-    auto g = readGraph("CitHepPh");
     for (auto _ : state)
     {
-        auto nodeSet = g->getNodeSet();
+        auto nodeSet = cit_graph_ptr->getNodeSet();
     }
 }
 
@@ -135,23 +134,11 @@ 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");
     for (auto _ : state)
     {
-        auto adjMatrix = g->getAdjMatrix();
+        auto adjMatrix = cit_graph_ptr->getAdjMatrix();
     }
 }
 

Diff for: benchmark/Utilities.hpp

@@ -7,11 +7,12 @@
 static std::map<unsigned long, CXXGRAPH::Node<int> *> generateRandomNodes(unsigned long numberOfNodes, int MaxValue)
 {
     std::map<unsigned long, CXXGRAPH::Node<int> *> nodes;
-    srand((unsigned)time(NULL));
+    unsigned int randSeed = (unsigned int)time(NULL);
+    srand(randSeed);
     int randomNumber;
     for (auto index = 0; index < numberOfNodes; index++)
     {
-        randomNumber = (rand_r(NULL) % MaxValue) + 1;
+        randomNumber = (rand_r(&randSeed) % MaxValue) + 1;
         CXXGRAPH::Node<int> *newNode = new CXXGRAPH::Node<int>(std::to_string(index), randomNumber);
         nodes[index] = newNode;
     }
@@ -21,14 +22,15 @@ static std::map<unsigned long, CXXGRAPH::Node<int> *> generateRandomNodes(unsign
 static std::map<unsigned long, CXXGRAPH::Edge<int> *> generateRandomEdges(unsigned long numberOfEdges, std::map<unsigned long, CXXGRAPH::Node<int> *> nodes)
 {
     std::map<unsigned long, CXXGRAPH::Edge<int> *> edges;
-    srand((unsigned)time(NULL));
+    unsigned int randSeed = (unsigned int)time(NULL);
+    srand(randSeed);
     int randomNumber1;
     int randomNumber2;
     auto MaxValue = nodes.size();
     for (auto index = 0; index < numberOfEdges; index++)
     {
-        randomNumber1 = (rand_r(NULL) % MaxValue);
-        randomNumber2 = (rand_r(NULL) % MaxValue);
+        randomNumber1 = (rand_r(&randSeed) % MaxValue);
+        randomNumber2 = (rand_r(&randSeed) % MaxValue);
         CXXGRAPH::Edge<int> *newEdge = new CXXGRAPH::Edge<int>(index, *(nodes.at(randomNumber1)), *(nodes.at(randomNumber2)));
         edges[index] = newEdge;
     }
@@ -38,14 +40,15 @@ static std::map<unsigned long, CXXGRAPH::Edge<int> *> generateRandomEdges(unsign
 static std::map<unsigned long, CXXGRAPH::UndirectedEdge<int> *> generateRandomUndirectedEdges(unsigned long numberOfEdges, std::map<unsigned long, CXXGRAPH::Node<int> *> nodes)
 {
     std::map<unsigned long, CXXGRAPH::UndirectedEdge<int> *> edges;
-    srand((unsigned)time(NULL));
+    unsigned int randSeed = (unsigned int)time(NULL);
+    srand(randSeed);
     int randomNumber1;
     int randomNumber2;
     auto MaxValue = nodes.size();
     for (auto index = 0; index < numberOfEdges; index++)
     {
-        randomNumber1 = (rand_r(NULL) % MaxValue);
-        randomNumber2 = (rand_r(NULL) % MaxValue);
+        randomNumber1 = (rand_r(&randSeed) % MaxValue);
+        randomNumber2 = (rand_r(&randSeed) % MaxValue);
         CXXGRAPH::UndirectedEdge<int> *newEdge = new CXXGRAPH::UndirectedEdge<int>(index, *(nodes.at(randomNumber1)), *(nodes.at(randomNumber2)));
         edges[index] = newEdge;
     }