Improved benchmark code

Author: Kalashnikovni

eval/eval_exec.cpp

@@ -19,8 +19,8 @@
 
 //#include "algorithms/cutvertex/cv_fact.hpp"
 //#include "algorithms/cc/cc.hpp"
-//#include "algorithms/matching/matching_fact.hpp"
-//#include "algorithms/scc/scc_fact.hpp"
+#include "algorithms/matching/matching_fact.hpp"
+#include "algorithms/scc/scc_fact.hpp"
 //#include "algorithms/toposort/ts_fact.hpp"
 #include "eval/eval_exec.hpp"
 #include "eval/file_evaluator.hpp"
@@ -55,11 +55,11 @@ void printHeader(Util::prog_opts::variables_map vm)
     std::cout << "Set implementation: " << LIB::SET_FACT.kind() << "\n";
     std::cout << "PWMap implementation: " << LIB::PWMAP_FACT.kind() << "\n";
     std::cout << "-----------------------------------\n";
-    //std::cout << "Matching algorithm: " << LIB::MATCH_FACT.kind() << "\n";
-    //std::cout << "SCC algorithm: " << LIB::SCC_FACT.kind() << "\n";
+    std::cout << "Matching algorithm: " << LIB::MATCH_FACT.kind() << "\n";
+    std::cout << "SCC algorithm: " << LIB::SCC_FACT.kind() << "\n\n";
     //std::cout << "Cut vertex algorithm: " << LIB::CV_FACT.kind() << "\n";
     //std::cout << "Topological sort algorithm: " << LIB::TS_FACT.kind()
-    //  << "\n";
+    // << "\n";
   }
   std::cout << "-----------------------------------\n";
   std::cout << ">>>>>>>>>>> Eval result <<<<<<<<<<<\n";
@@ -88,6 +88,8 @@ EvalExecutor::EvalExecutor() : scc_impl_(1)
      "\n  - 0 for V1 of minimum reachable SCC"
      "\n  - 1 for V2 of minimum reachable SCC (default option)");
 
+  // First option without name is the input file
+  _positional.add("input-file", 1);
   _cmd_line_opts.add(_generic).add(_config).add(_hidden);
   _cfg_file_opts.add(_config).add(_hidden);
   _visible.add(_generic).add(_config);
@@ -123,12 +125,12 @@ detail::EvalUserInput EvalExecutor::chooseImplementation()
   return result;
 }
 
-void EvalExecutor::execute(int arg_count, char* args[])
+void EvalExecutor::execute(int argc, char* argv[])
 {
   // Command line options handling ---------------------------------------------
 
   Util::prog_opts::variables_map vm;
-  store(Util::prog_opts::command_line_parser(arg_count, args)
+  store(Util::prog_opts::command_line_parser(argc, argv)
     .options(_cmd_line_opts).positional(_positional).run(), vm);
   notify(vm);
 

eval/eval_exec.hpp

@@ -49,4 +49,4 @@ class EvalExecutor : public Util::UserInputHandler {
 
 } // namespace SBG
 
-#endif
+#endif // SBGRAPH_EVAL_EVAL_EXEC_HPP_

eval/main.cpp

@@ -29,7 +29,7 @@
 
 #include "eval/eval_exec.hpp"
 
-int main(int argc, char**argv)
+int main(int argc, char* argv[])
 {
   std::cout << std::boolalpha;
 

eval/pretty_print.hpp

@@ -74,4 +74,4 @@ std::ostream& operator<<(std::ostream& out, const ProgramIO& p);
 
 } // namespace SBG
 
-#endif
+#endif // SBGRAPH_EVAL_PRETTY_PRINT_HPP_

eval/user_input.hpp

@@ -71,4 +71,4 @@ class EvalUserInput {
 
 } // namespace SBG
 
-#endif
+#endif // SBGRAPH_EVAL_USER_INPUT_HPP_

parser/parser_exec.cpp

@@ -36,6 +36,8 @@ namespace Parser {
 
 ParserExecutor::ParserExecutor() : UserInputHandler()
 {
+  // First option without name is the input file
+  _positional.add("input-file", 1);
   _cmd_line_opts.add(_generic).add(_config).add(_hidden);
   _cfg_file_opts.add(_config).add(_hidden);
   _visible.add(_generic).add(_config);

sbg/CMakeLists.txt

@@ -22,6 +22,7 @@ target_sources(
     ord_set.cpp
     ord_unidim_dense_set.cpp
     pw_map.cpp
+    pwmap_detail.cpp
     pwmap_fact.cpp
     rational.cpp
     sbg.cpp

sbg/ord_pwmap.cpp

@@ -20,7 +20,6 @@
 #include "sbg/set_fact.hpp"
 #include "sbg/ord_pwmap.hpp"
 
-#include <algorithm>
 #include <forward_list>
 #include <set>
 #include <iostream>
@@ -410,15 +409,14 @@ Set OrdPWMap::preImage(const Set& subcodom) const
 
 OrdPWMap OrdPWMap::inverse() const
 {
-  OrdMapCollection result;
+  OrdPWMap result;
 
   for (const MapEntry& entry : _pieces) {
     Map m = entry.map();
-    result.emplace_back(Map{m.image(), m.law().inverse()});
+    result.emplace(Map{m.image(), m.law().inverse()});
   }
 
-  std::sort(result.begin(), result.end()); 
-  return OrdPWMap{std::move(result)};
+  return result;
 }
 
 OrdPWMap OrdPWMap::composition(const OrdPWMap& other) const
@@ -589,7 +587,7 @@ OrdPWMap OrdPWMap::reduce() const
 
   for (const MapEntry& entry : _pieces) {
     std::vector<Map> reduced = entry.map().reduce();
-    for(Map& reduced_map : reduced) {
+    for (Map& reduced_map : reduced) {
       result.insert(std::move(reduced_map));
     }
   }

sbg/ord_pwmap.hpp

@@ -140,6 +140,7 @@ class OrdPWMap {
 
   friend class AddCore;
   friend class MinAdjCore;
+  friend class PWMapAccessKey;
 };
 
 template<typename... Args>

sbg/pw_map.hpp

@@ -51,6 +51,8 @@ namespace detail {
 
 using PWMapImpl = std::variant<UnordPWMap, OrdPWMap>;
 
+class PWMapAccessKey;
+
 } // namespace detail
 
 enum class PWMapKind { kUnordered, kOrdered, kDomOrdered };
@@ -238,6 +240,8 @@ class PWMap {
   PWMap(detail::PWMapImpl&& impl);
 
   detail::PWMapImpl _impl;
+
+  friend class detail::PWMapAccessKey;
 };
 
 std::ostream& operator<<(std::ostream& out, const PWMap& pw);