Try rebasing on to v3, fail, cry, fix some issues, get stuck, flip ta…

…ble, clock off.
reiniscirpons · Dec 2, 2024 · 720038f · 720038f
1 parent 0c6b097
commit 720038f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/include/libsemigroups/sims.hpp b/include/libsemigroups/sims.hpp
@@ -2951,7 +2951,7 @@ namespace libsemigroups {
     //! Default constructor.
     explicit SimsRefinerIdeals()
         : _knuth_bendices(std::thread::hardware_concurrency() + 1,
-                          KnuthBendix_(congruence_kind::twosided)) {
+                          KnuthBendix_()) {
       init();
     }
 
@@ -2962,7 +2962,7 @@ namespace libsemigroups {
     //!
     //! \returns A reference to \c *this.
     SimsRefinerIdeals& init() {
-      _knuth_bendices[0].init(congruence_kind::twosided).run();
+      _knuth_bendices[0].init();
       std::fill(_knuth_bendices.begin() + 1,
                 _knuth_bendices.end(),
                 _knuth_bendices[0]);
@@ -2981,7 +2981,7 @@ namespace libsemigroups {
     template <typename Word>
     explicit SimsRefinerIdeals(Presentation<Word> const& p)
         : _knuth_bendices(std::thread::hardware_concurrency() + 1,
-                          KnuthBendix_(congruence_kind::twosided)) {
+                          KnuthBendix_(congruence_kind::twosided, p)) {
       init(p);
     }
 

diff --git a/include/libsemigroups/sims.tpp b/include/libsemigroups/sims.tpp
@@ -156,7 +156,7 @@ namespace libsemigroups {
         return false;
       }
 
-      ToddCoxeter tc(congruence_kind::right);
+      ToddCoxeter tc;
 
       auto   tree = word_graph::spanning_tree(wg, 0);
       size_t N    = wg.number_of_active_nodes();
@@ -171,7 +171,9 @@ namespace libsemigroups {
           // TODO(2) avoid the copy here
           copy.induced_subgraph_no_checks(static_cast<Node>(0),
                                           wg.number_of_active_nodes());
-          tc.init(tc.kind(), p, copy).add_pair(wx, wy);
+          tc.init(congruence_kind::onesided, copy)
+              .add_generating_pair_no_checks(
+                  wx.cbegin(), wx.cend(), wy.cbegin(), wy.cend());
           LIBSEMIGROUPS_ASSERT(tc.word_graph().number_of_nodes()
                                == wg.number_of_active_nodes());
           // fmt::print("x = {}, y = {}\n", x, y);

diff --git a/src/sims.cpp b/src/sims.cpp
@@ -1525,7 +1525,7 @@ namespace libsemigroups {
       auto const& v = p.second;
       // TODO(1) change this to be const_contains for knuth
       // bendix when we have it
-      if (!kb.contains(u, v)) {
+      if (!kb.contains(u.cbegin(), u.cend(), v.cbegin(), v.cend())) {
         auto beta
             = word_graph::follow_path_no_checks(wg, 0, u.cbegin(), u.cend());
         if (sink == UNDEFINED) {

diff --git a/tests/test-sims.cpp b/tests/test-sims.cpp
@@ -4933,7 +4933,6 @@ namespace libsemigroups {
     using words::operator+;
 
     Presentation<word_type> p;
-    ToddCoxeter             tc(congruence_kind::twosided);
     // plusses indicate that the result was reached but could not be verified.
     std::vector<size_t>  results = {1, 2, 7, 22, +84, +364, +1734, +8943};
     WordGraph<node_type> wg;
@@ -4983,7 +4982,6 @@ namespace libsemigroups {
     using words::operator+;
 
     Presentation<word_type> p;
-    ToddCoxeter             tc(congruence_kind::twosided);
     // plusses indicate that the result was reached but could not be verified.
     std::vector<size_t>    results = {1,
                                       1,
@@ -5050,7 +5048,6 @@ namespace libsemigroups {
     using words::operator+;
 
     Presentation<word_type> p;
-    ToddCoxeter             tc(congruence_kind::twosided);
     // plusses indicate that the result was reached but could not be verified.
     std::vector<size_t>  results = {1, 2, 6, 14, +39, +117, +383, +1311, +7080};
     WordGraph<node_type> wg;
@@ -5097,7 +5094,6 @@ namespace libsemigroups {
     using words::operator+;
 
     Presentation<word_type> p;
-    ToddCoxeter             tc(congruence_kind::twosided);
     // plusses indicate that the result was reached but could not be verified.
     std::vector<size_t> results
         = {1, 2, 6, 13, +31, +77, +197, +513, +1354, +3611, +9714};
@@ -5147,7 +5143,6 @@ namespace libsemigroups {
     using words::operator+;
 
     Presentation<word_type> p;
-    ToddCoxeter             tc(congruence_kind::twosided);
     // plusses indicate that the result was reached but could not be verified.
     std::vector<size_t>    results = {1, 1, 3, 7, 22, 46, +196, +523};
     WordGraph<node_type>   wg;