diff --git a/benchmark/Partition_BM.cpp b/benchmark/Partition_BM.cpp index c4c6d69c8..61b274c1d 100644 --- a/benchmark/Partition_BM.cpp +++ b/benchmark/Partition_BM.cpp @@ -13,8 +13,8 @@ static void PartitionHDRF_X(benchmark::State &state) { g.addEdge(&(*e.second)); } for (auto _ : state) { - auto result = g.partitionGraph( - CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + g, CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, 1, 0.001); } } BENCHMARK(PartitionHDRF_X) @@ -24,8 +24,9 @@ BENCHMARK(PartitionHDRF_X) 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); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + *cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::HDRF_ALG, 4, + 1, 0.001); } } @@ -41,8 +42,8 @@ static void PartitionEBVC_X(benchmark::State &state) { g.addEdge(&(*e.second)); } for (auto _ : state) { - auto result = g.partitionGraph( - CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + g, CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4); } } BENCHMARK(PartitionEBVC_X) @@ -52,7 +53,8 @@ BENCHMARK(PartitionEBVC_X) static void PartitionEBVC_FromReadedCitHep(benchmark::State &state) { auto edgeSet = cit_graph_ptr->getEdgeSet(); for (auto _ : state) { - auto result = cit_graph_ptr->partitionGraph( + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + *cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::EDGEBALANCED_VC_ALG, 4); } } @@ -69,8 +71,8 @@ static void PartitionGVC_X(benchmark::State &state) { g.addEdge(&(*e.second)); } for (auto _ : state) { - auto result = g.partitionGraph( - CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + g, CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4); } } BENCHMARK(PartitionGVC_X) @@ -80,7 +82,8 @@ BENCHMARK(PartitionGVC_X) static void PartitionGVC_FromReadedCitHep(benchmark::State &state) { auto edgeSet = cit_graph_ptr->getEdgeSet(); for (auto _ : state) { - auto result = cit_graph_ptr->partitionGraph( + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + *cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::GREEDY_VC_ALG, 4); } } @@ -97,8 +100,8 @@ static void PartitionEBV_X(benchmark::State &state) { g.addEdge(&(*e.second)); } for (auto _ : state) { - auto result = g.partitionGraph( - CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, 1, 1); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + g, CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, 1, 1); } } BENCHMARK(PartitionEBV_X) @@ -108,8 +111,9 @@ BENCHMARK(PartitionEBV_X) 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); + auto result = CXXGraph::Partitioning::Partitioner::partitionGraph( + *cit_graph_ptr, CXXGraph::Partitioning::PartitionAlgorithm::EBV_ALG, 4, + 1, 1); } }