[iss-44]

Kalashnikovni · Kalashnikovni · commit b661a6a7c58d · 2025-03-17T16:50:47.000-03:00
diff --git a/eval/main.cpp b/eval/main.cpp
@@ -64,26 +64,26 @@ void parseEvalProgramFromFile(std::string fname, Impl impl, bool debug)
     std::cout << ">>>>>> Eval result <<<<<<\n";
     std::cout << "-------------------------\n\n";
 
-    std::unique_ptr<SBG::LIB::SetAF> set_fact 
-      = std::make_unique<SBG::LIB::UnordAF>();
+    std::shared_ptr<SBG::LIB::SetAF> set_fact 
+      = std::make_shared<SBG::LIB::UnordAF>();
 
     switch (impl.set_impl_) {
       case 2:
-        set_fact = std::make_unique<SBG::LIB::OrdDenseAF>();
+        set_fact = std::make_shared<SBG::LIB::OrdDenseAF>();
 
       default:
         break;
     }
 
     SBG::LIB::MapAF map_fact(*set_fact);
-    std::unique_ptr<SBG::LIB::PWMapAF> fact
-      = std::make_unique<SBG::LIB::UnordPWMapAF>(map_fact);
+    std::shared_ptr<SBG::LIB::PWMapAF> fact
+      = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact);
     switch (impl.pw_impl_) {
       default:
         break;
     }
 
-    SBG::Eval::ProgramVisitor program_visit(*fact, debug); 
+    SBG::Eval::ProgramVisitor program_visit(fact, debug); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/eval/visitors/program_visitor.cpp b/eval/visitors/program_visitor.cpp
@@ -23,8 +23,8 @@ namespace SBG {
 
 namespace Eval {
 
-ProgramVisitor::ProgramVisitor(const LIB::PWMapAF &fact, bool debug)
-  : fact_(fact), env_(), debug_(debug) {}
+ProgramVisitor::ProgramVisitor(std::shared_ptr<LIB::PWMapAF> fact, bool debug)
+  : fact_(*fact), env_(), debug_(debug) {}
 
 ProgramIO ProgramVisitor::operator()(AST::Program p) const 
 { 
diff --git a/eval/visitors/program_visitor.hpp b/eval/visitors/program_visitor.hpp
@@ -39,7 +39,7 @@ namespace Eval {
 
 struct ProgramVisitor : public boost::static_visitor<ProgramIO> {
   public:
-  ProgramVisitor(const LIB::PWMapAF &fact, bool debug);
+  ProgramVisitor(std::shared_ptr<LIB::PWMapAF> fact, bool debug);
  
   ProgramIO operator()(AST::Program p) const; 
 
diff --git a/test/Makefile.include b/test/Makefile.include
@@ -9,14 +9,14 @@ EVAL_TEST_DIR   := $(TEST_DIR)/eval
 SBG_TEST        := sbg-test
 
 $(SBG_TEST):
-	#@echo BUILDING PERFORMANCE SYSTEM TESTS
-	#@cd $(PERF_TEST_DIR) && rm -rf bin/ obj/
-	#@cd $(PERF_TEST_DIR) && $(MAKE) bin/sbg-performance
-	#@cd $(BOOST_TEST_DIR) && $(MAKE) bin/boost-performance
-	#@echo Done
-	#@echo RUNNING PERFORMANCE SYSTEM TESTS
-	#@cd $(PERF_TEST_DIR) && $(MAKE) sbg-performance
-	#@echo Done
+	@echo BUILDING PERFORMANCE SYSTEM TESTS
+	@cd $(PERF_TEST_DIR) && rm -rf bin/ obj/
+	@cd $(PERF_TEST_DIR) && $(MAKE) bin/sbg-performance
+	@cd $(BOOST_TEST_DIR) && $(MAKE) bin/boost-performance
+	@echo Done
+	@echo RUNNING PERFORMANCE SYSTEM TESTS
+	@cd $(PERF_TEST_DIR) && $(MAKE) sbg-performance
+	@echo Done
 	@echo BUILDING PARSER SYSTEM TESTS
 	@cd $(PARSER_TEST_DIR) && $(MAKE) bin/sbg-test
 	@echo Done
diff --git a/test/eval/Makefile b/test/eval/Makefile
@@ -37,7 +37,7 @@ $(BUILD_DIR)/test_%.o : $(TEST_DIR)/%.cpp
 $(BUILD_DIR)/%.o : $(SRC_DIR)/%.cpp
 	$(G++) $(G++_FLAGS) $< -o $@ 
 
-all: $(TARGET) $(RUN_TESTS)
+all: $(TARGET)
 
 $(TARGET): $(MAIN_OBJ) $(TEST_OBJ) $(BUILD_DIR)
 		g++ -o $(TARGET) $(MAIN_OBJ) $(TEST_OBJ) $(LD_FLAGS) $(LIB)
diff --git a/test/eval/gt_data/arithmetic/arithmetic.cpp b/test/eval/gt_data/arithmetic/arithmetic.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/eval/gt_data/interval/interval.cpp b/test/eval/gt_data/interval/interval.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/eval/gt_data/lexp/lexp.cpp b/test/eval/gt_data/lexp/lexp.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/eval/gt_data/map/map.cpp b/test/eval/gt_data/map/map.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false);
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false);
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/eval/gt_data/pw_map/pw_map.cpp b/test/eval/gt_data/pw_map/pw_map.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/eval/gt_data/set/set.cpp b/test/eval/gt_data/set/set.cpp
@@ -49,7 +49,10 @@ void parseEvalProgramFromFile(std::string fname)
     SBG::Util::SBG_LOG << ">>>>>> Eval result <<<<<<\n";
     SBG::Util::SBG_LOG << "-------------------------\n\n";
 
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    auto fact = std::make_shared<SBG::LIB::UnordPWMapAF>(map_fact); 
+    SBG::Eval::ProgramVisitor program_visit(fact, false);
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
diff --git a/test/performance/boost/Makefile b/test/performance/boost/Makefile
@@ -37,7 +37,7 @@ $(BUILD_DIR)/test_%.o : $(TEST_DIR)/%.cpp
 $(BUILD_DIR)/%.o : $(SRC_DIR)/%.cpp
 	$(G++) $(G++_FLAGS) $< -o $@ 
 
-all: $(TARGET) $(RUN_TESTS)
+all: $(TARGET) #$(RUN_TESTS)
 
 $(TARGET): $(MAIN_OBJ) $(TEST_OBJ) $(BUILD_DIR)
 		g++ -o $(TARGET) $(MAIN_OBJ) $(TEST_OBJ) $(LD_FLAGS) $(LIB)
diff --git a/test/performance/boost/main.cpp b/test/performance/boost/main.cpp
@@ -40,6 +40,9 @@
 #include <test/performance/boost/ordinary_graph_builder.hpp>
 #include <util/defs.hpp>
 
+template<class... Ts> struct Overload : Ts... { using Ts::operator()...; };
+template<class... Ts> Overload(Ts...) -> Overload<Ts...>;
+
 void computeMaxCardinalityMatching(OG::Graph graph)
 {
   int n_vertices = num_vertices(graph);
@@ -88,66 +91,36 @@ void computeTS(OG::DGraph graph)
     << total.count() << " [μs]" << std::endl;
 }
 
-auto graph_visitor_ = SBG::Eval::Overload {
-  [](int a, SBG::LIB::BaseSBG b) {
-    SBG::LIB::BaseMatch match(b, false);
-    match.calculate().matched_edges();
-
-    if (a == 0) {
-      OG::OrdinaryGraphBuilder ordinary_graph_builder(b);
-      OG::Graph graph = ordinary_graph_builder.build();
-      computeMaxCardinalityMatching(graph);
-    }
-
-    SBG::LIB::BaseSCC scc(buildSCCFromMatching(match), false);
-    SBG::LIB::BasePWMap scc_res = scc.calculate();
- 
-    if (a == 1) {
-      OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(scc.dsbg());
-      OG::DGraph dgraph = ordinary_dgraph_builder.build();
-      computeSCC(dgraph);
-    }
-
-    SBG::LIB::BaseTopSort ts(buildSortFromSCC(scc, scc_res), false);
+void algorithmEvaluator(int alg, SBG::LIB::SBG g)
+{
+  SBG::LIB::SBGMatching match(g, false);
+  match.calculate();
 
-    if (a == 2) {
-      OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(ts.dsbg());
-      OG::DGraph dgraph = ordinary_dgraph_builder.build();
-      computeTS(dgraph);
-    }
-  },
-  [](int a, SBG::LIB::CanonSBG b) {
-    SBG::LIB::CanonMatch match(b, false);
-    match.calculate().matched_edges();
-
-    if (a == 0) {
-      OG::OrdinaryGraphBuilder ordinary_graph_builder(b);
-      OG::Graph graph = ordinary_graph_builder.build();
-      computeMaxCardinalityMatching(graph);
-    }
+  if (alg == 0) {
+    OG::OrdinaryGraphBuilder ordinary_graph_builder(g);
+    OG::Graph graph = ordinary_graph_builder.build();
+    computeMaxCardinalityMatching(graph);
+  }
 
-    SBG::LIB::CanonSCC scc(buildSCCFromMatching(match), false);
-    SBG::LIB::CanonPWMap scc_res = scc.calculate();
+  SBG::LIB::SBGSCC scc(buildSCCFromMatching(match), false);
+  SBG::LIB::PWMap scc_res = scc.calculate();
  
-    if (a == 1) {
-      OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(scc.dsbg());
-      OG::DGraph dgraph = ordinary_dgraph_builder.build();
-      computeSCC(dgraph);
-    }
+  if (alg == 1) {
+    OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(scc.dsbg());
+    OG::DGraph dgraph = ordinary_dgraph_builder.build();
+    computeSCC(dgraph);
+  }
 
-    SBG::LIB::CanonTopSort ts(buildSortFromSCC(scc, scc_res), false);
+  SBG::LIB::SBGTopSort ts(buildSortFromSCC(scc, scc_res), false);
 
-    if (a == 2) {
-      OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(ts.dsbg());
-      OG::DGraph dgraph = ordinary_dgraph_builder.build();
-      computeTS(dgraph);
-    }
-  },
-  [](auto a, auto b) {
-    SBG::Util::ERROR("Wrong arguments for algorithm");
-    return;
+  if (alg == 2) {
+    OG::OrdinaryDGraphBuilder ordinary_dgraph_builder(ts.dsbg());
+    OG::DGraph dgraph = ordinary_dgraph_builder.build();
+    computeTS(dgraph);
   }
-};
+
+  return;
+}
 
 void parseEvalProgramFromFile(int alg, std::string fname, int copies)
 {
@@ -169,17 +142,18 @@ void parseEvalProgramFromFile(int alg, std::string fname, int copies)
   );
 
   if (r && iter == end) {
-    SBG::Eval::ProgramVisitor program_visit(false); 
+    SBG::LIB::UnordAF set_fact;
+    SBG::LIB::MapAF map_fact(set_fact);
+    SBG::LIB::UnordPWMapAF fact(map_fact);
+    SBG::Eval::ProgramVisitor program_visit(fact, false); 
     SBG::Eval::ProgramIO visit_result = boost::apply_visitor(
       program_visit, parser_result
     );
 
-    for (const SBG::Eval::ExprEval &ev : visit_result.exprs()) {
-      auto e = std::get<1>(ev);
-      if (std::holds_alternative<SBG::Eval::SBGBaseType>(e)) {
-        auto g_variant = std::get<SBG::Eval::SBGBaseType>(e);
-        std::visit(graph_visitor_, std::variant<int>(alg), g_variant);
-      }
+    for (const SBG::Eval::ExprEval &ev : visit_result.exprs_) {
+      SBG::Eval::ExprBaseType e = std::get<1>(ev);
+      if (std::holds_alternative<SBG::LIB::SBG>(e))
+        algorithmEvaluator(alg, std::get<SBG::LIB::SBG>(e));
     }
   }
   else {
diff --git a/test/performance/boost/ordinary_graph.hpp b/test/performance/boost/ordinary_graph.hpp
@@ -23,7 +23,7 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/subgraph.hpp>
 
-#include <util/defs.hpp>
+#include <sbg/natural.hpp>
 
 namespace OG {
 
diff --git a/test/performance/boost/ordinary_graph_builder.cpp b/test/performance/boost/ordinary_graph_builder.cpp
diff --git a/test/performance/boost/ordinary_graph_builder.hpp b/test/performance/boost/ordinary_graph_builder.hpp

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ namespace SBG {`
`23`	`23`
`24`	`24`	`namespace Eval {`
`25`	`25`
`26`		`-ProgramVisitor::ProgramVisitor(const LIB::PWMapAF &fact, bool debug)`
`27`		`- : fact_(fact), env_(), debug_(debug) {}`
	`26`	`+ProgramVisitor::ProgramVisitor(std::shared_ptr<LIB::PWMapAF> fact, bool debug)`
	`27`	`+ : fact_(*fact), env_(), debug_(debug) {}`
`28`	`28`
`29`	`29`	`ProgramIO ProgramVisitor::operator()(AST::Program p) const`
`30`	`30`	`{`