Redefined benchmarksfor for new interfaces

Author: Kalashnikovni

test/performance/CMakeLists.txt

@@ -4,8 +4,9 @@ add_executable(sbg-benchmark benchmark_main.cpp)
 target_sources(sbg-benchmark
                PRIVATE
                benchmark_main.cpp
-               dom_ord_pwmap_bm.cpp
-               ord_set_bm.cpp)
+               #dom_ord_pwmap_bm.cpp
+               #unord_set_bm.cpp
+               unord_pwmap_bm.cpp)
 
 set_target_properties(sbg-benchmark PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY
@@ -24,6 +25,6 @@ target_link_libraries(sbg-benchmark
                       sbg-dev
                       sbg-eval-lib)
 
-add_subdirectory(boost)
+#add_subdirectory(boost)
 add_subdirectory(matching)
 add_subdirectory(scc)

test/performance/boost/ordinary_graph_builder.cpp

@@ -17,6 +17,7 @@
 
  ******************************************************************************/
 
+#include "sbg/multidim_inter.hpp"
 #include "test/performance/boost/ordinary_graph_builder.hpp"
 #include "util/time_profiler.hpp"
 
@@ -26,24 +27,25 @@ namespace OG {
 // Auxiliary functions ---------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-static SBG::LIB::MD_NAT nextElem(SBG::LIB::MD_NAT curr, SBG::LIB::SetPiece mdi)
+static SBG::LIB::MD_NAT nextElem(SBG::LIB::MD_NAT curr
+  , SBG::LIB::detail::MultiDimInter mdi)
 {
   SBG::LIB::MD_NAT min = mdi.minElem();
   SBG::LIB::MD_NAT max = mdi.maxElem();
-  SBG::LIB::MD_NAT res;
+  SBG::LIB::MD_NAT result;
   for (unsigned int j = 0; j < mdi.arity(); ++j) {
     if (curr[j] == max[j]) {
-      res.emplaceBack(min[j]);
+      result.pushBack(min[j]);
     } else {
-      res.emplaceBack(curr[j] + 1);
+      result.pushBack(curr[j] + 1);
       for (unsigned int k = 1; k < mdi.arity() - j; ++k) {
-        res.emplaceBack(curr[j + k]);
+        result.pushBack(curr[j + k]);
       }
       break;
     } 
   }
 
-  return res;
+  return result;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -75,7 +77,8 @@ void OrdinaryGraphBuilder::translateVertices()
   SBG::LIB::Set X = _bsbg.X();
   SBG::LIB::NAT count = 0;
   for (const SBG::LIB::SetPiece& mdi : V) { 
-    SBG::LIB::MD_NAT begin = mdi.minElem(), end = mdi.maxElem();
+    SBG::LIB::MD_NAT begin = mdi.minElem();
+    SBG::LIB::MD_NAT end = mdi.maxElem();
     for (auto it = begin; it != end; it = nextElem(it, mdi)) {
       _vertex_map[it] = count;
       _partition.emplace_back(
@@ -98,7 +101,8 @@ EdgeVector OrdinaryGraphBuilder::getEdgeList()
   const SBG::LIB::PWMap& map1 = _bsbg.map1();
   const SBG::LIB::PWMap& map2 = _bsbg.map2();
   for (const SBG::LIB::SetPiece& mdi : E) { 
-    SBG::LIB::MD_NAT begin = mdi.minElem(), end = mdi.maxElem();
+    SBG::LIB::MD_NAT begin = mdi.minElem();
+    SBG::LIB::MD_NAT end = mdi.maxElem();
     for (auto it = begin; it != end; it = nextElem(it, mdi)) {
       // Get endings of edge
       SBG::LIB::SetPiece it_mdi(it);

test/performance/boost/ordinary_graph_builder.hpp

@@ -25,19 +25,21 @@
 
  ******************************************************************************/
 
-#ifndef PERF_ORDINARY_BUILDER_HPP
-#define PERF_ORDINARY_BUILDER_HPP
+#ifndef SBGRAPH_TEST_PERFORMANCE_BOOST_ORDINARY_GRAPH_BUILDER_HPP_
+#define SBGRAPH_TEST_PERFORMANCE_BOOST_ORDINARY_GRAPH_BUILDER_HPP_
 
-#include <map>
-
-#include "test/performance/boost/ordinary_graph.hpp"
 #include "sbg/bipartite_sbg.hpp"
+#include "sbg/natural.hpp"
+#include "test/performance/boost/ordinary_graph.hpp"
 #include "util/logger.hpp"
 
+#include <map>
+#include <vector>
+
 namespace OG {
 
 class OrdinaryGraphBuilder {
-  public:
+public:
   OrdinaryGraphBuilder(SBG::LIB::BipartiteSBG bsbg);
 
   BipartiteGraph build();
@@ -46,7 +48,7 @@ class OrdinaryGraphBuilder {
   void translateVertices();
   EdgeVector getEdgeList();
 
-  private:
+private:
   const SBG::LIB::BipartiteSBG _bsbg; ///< Input bipartite SBG to convert
   std::map<SBG::LIB::MD_NAT, Vertex> _vertex_map;
     ///< Map from SBG vertex identifier to Graph element
@@ -55,4 +57,4 @@ class OrdinaryGraphBuilder {
 
 }  // namespace OG
 
-#endif
+#endif // SBGRAPH_TEST_PERFORMANCE_BOOST_ORRDINARY_GRAPH_BUILDER_HPP_

test/performance/matching/custom_match_bm.cpp

@@ -29,7 +29,10 @@
 
 #include <benchmark/benchmark.h>
 
+#include "algorithms/matching/matching.hpp"
+#include "algorithms/matching/matching_fact.hpp"
 #include "eval/user_impl_map.hpp"
+#include "sbg/directed_sbg.hpp"
 #include "test/performance/utils.hpp"
 
 namespace Test {

test/performance/matching/match_bm.cpp

@@ -24,11 +24,13 @@
  * execution time when the repetitive patterns increase its size.
  */
 
-#include <benchmark/benchmark.h>
-
+#include "algorithms/matching/matching.hpp"
+#include "algorithms/matching/matching_fact.hpp"
 #include "eval/user_impl_map.hpp"
 #include "test/performance/utils.hpp"
 
+#include <benchmark/benchmark.h>
+
 namespace Test {
 
 namespace Internal {