Skip to content

Commit

Permalink
Fix some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@reiniscirpons
reiniscirpons committed Sep 27, 2024
1 parent f0e5b98 commit 0a096e8
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 50 deletions.
18 changes: 9 additions & 9 deletions include/libsemigroups/sims.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// * python bindings
// * gap bindings

// TODO(2)(later):
// TODO(2) (later):
// * use SimsRefinerFaithful in RepOrc + MinimalRepOrc
// * a version which allows specifying the word_graph to Sims1 too
// * implement maximum_2_sided_congruence_contained to compute the kernel of the
Expand All @@ -40,7 +40,7 @@
// first (by using generating pairs), and then to try and find a right
// congruence not containing any of the minimal 2-sided congruences.
//
// TODO(3)(far future):
// TODO(3) (far future):
// * Figure out a way of making refining functions possible. A refining function
// differs from a pruner in that it is also allowed to modify the word graph.
// * Implement one and two sided compatibility checking as refiners, following
Expand Down Expand Up @@ -349,7 +349,7 @@ namespace libsemigroups {
//!
//! \exception
//! \no_libsemigroups_except
// TODO(0)(tests)
// TODO(0) (tests)
Subclass& init();

//! Copy constructor.
Expand Down Expand Up @@ -940,7 +940,7 @@ namespace libsemigroups {
return static_cast<Subclass&>(*this);
}

// TODO(2)(later) ranges version of include/exclude?
// TODO(2) (later) ranges version of include/exclude?

//! \brief Get the current stats object.
//!
Expand Down Expand Up @@ -1145,7 +1145,7 @@ namespace libsemigroups {

protected:
using PendingDef = typename Sims1or2::PendingDef;
// TODO(1)(Sims1) ensure that _felsch_graph's settings are
// TODO(1) (Sims1) ensure that _felsch_graph's settings are
// properly initialised
using Definition = std::pair<node_type, label_type>;

Expand Down Expand Up @@ -1409,10 +1409,10 @@ namespace libsemigroups {

public:
//! Default constructor
// TODO(0)(doc)
// TODO(0) (doc)
Sims1() = default;

// TODO(0)(doc)
// TODO(0) (doc)
using SimsBase::init;

//! \brief Construct from a presentation.
Expand Down Expand Up @@ -1608,7 +1608,7 @@ namespace libsemigroups {
//! significantly cheaper than postfix incrementing \c it++.
//!
//! \sa cend
// TODO(2)(Sims1) it'd be good to remove node 0 to avoid confusion. This
// TODO(2) (Sims1) it'd be good to remove node 0 to avoid confusion. This
// seems complicated however, and so isn't done at present.
[[nodiscard]] iterator cbegin(size_type n) const;

Expand Down Expand Up @@ -2131,7 +2131,7 @@ namespace libsemigroups {
// Right Congruence Generating Pairs (rcgp)
class const_rcgp_iterator {
public:
// TODO(0)(doc)
// TODO(0) (doc)
using size_type = typename std::vector<relation_type>::size_type;
using difference_type =
typename std::vector<relation_type>::difference_type;
Expand Down
4 changes: 3 additions & 1 deletion src/sims.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,10 @@ namespace libsemigroups {
}
return true;
};
// NOTE:: setting _exclude_pruner_index here depends on the implementation
// of add_pruner, if that changes bad things may happen.
_exclude_pruner_index = _pruners.size();
add_pruner(pruner);
_exclude_pruner_index = _pruners.size() - 1;
return _exclude_pruner_index;
}

Expand Down
90 changes: 50 additions & 40 deletions tests/test-sims.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1932,10 +1932,12 @@ namespace libsemigroups {
// This doesn't fail it's just very extreme
// TODO(2): This does now fail, we get 30 instead of 22 in the relevant
// entry.
std::vector<std::array<size_t, 7>> left
// Note: num_congs[n][m] is the number of right congruences of
// rectangular_band(m, n)
std::vector<std::array<size_t, 6>> num_congs
= {{0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{0, 0, 6, 22, 94, 454, 2'430},
{0, 0, 6, 22, 94, 454},
{0, 0, 30, 205, 1'555, 12'880},
{0, 0, 240, 4'065, 72'465, 1'353'390},
{0, 0, 2'756, 148'772, 8'174'244, 456'876'004}};
Expand All @@ -1945,7 +1947,7 @@ namespace libsemigroups {

auto rg = ReportGuard(true);
for (size_t m = 2; m <= 5; ++m) {
for (size_t n = 2; n <= 6; ++n) {
for (size_t n = 2; n <= 5; ++n) {
std::cout << std::string(72, '#') << "\n"
<< "CASE m, n = " << m << ", " << n << "\n"
<< std::string(72, '#') << std::endl;
Expand All @@ -1954,38 +1956,33 @@ namespace libsemigroups {
Sims1 S(p);
REQUIRE(S.number_of_threads(std::thread::hardware_concurrency())
.number_of_congruences(m * n)
== left[m][n]);
== num_congs[n][m]);
presentation::reverse(p);
S.init(p);
REQUIRE(S.number_of_threads(std::thread::hardware_concurrency())
.number_of_congruences(m * n)
== left[n][m]);
== num_congs[m][n]);
}
}
}

LIBSEMIGROUPS_TEST_CASE("Sims1",
"048",
"stellar_monoid(n) n = 3 .. 4",
"[fail][sims1][babbage]") {
std::array<uint64_t, 10> const size = {0, 0, 0, 16, 65};
std::array<uint64_t, 10> const num_left = {0, 0, 0, 1'550, 0};
std::array<uint64_t, 10> const num_right = {0, 0, 0, 1'521, 0};

for (size_t n = 3; n < 5; ++n) {
auto p = zero_rook_monoid(n);
auto q = stellar_monoid(n);
p.rules.insert(p.rules.end(), q.rules.cbegin(), q.rules.cend());
// TODO(2): This line fails for some reason
REQUIRE(p.alphabet().size() == n + 1);
presentation::reverse(p);
Sims1 S;
S.presentation(p).number_of_threads(std::thread::hardware_concurrency());
REQUIRE(S.number_of_congruences(size[n]) == num_left[n]);
presentation::reverse(p);
S.presentation(p);
REQUIRE(S.number_of_congruences(size[n]) == num_right[n]);
}
"stellar_monoid(n) n = 3",
"[quick][sims1][babbage]") {
size_t n = 3;
auto p = zero_rook_monoid(n);
auto q = stellar_monoid(n);
p.rules.insert(p.rules.end(), q.rules.cbegin(), q.rules.cend());
p.validate();
REQUIRE(p.alphabet().size() == n);
presentation::reverse(p);
Sims1 S;
S.presentation(p).number_of_threads(std::thread::hardware_concurrency());
REQUIRE(S.number_of_congruences(16) == 1'550);
presentation::reverse(p);
S.presentation(p);
REQUIRE(S.number_of_congruences(16) == 1'521);
}

LIBSEMIGROUPS_TEST_CASE("Sims1",
Expand Down Expand Up @@ -2134,8 +2131,8 @@ namespace libsemigroups {

C.presentation(p).long_rule_length(6).number_of_threads(
std::thread::hardware_concurrency());
// This answer seems wrong, we get at least 734 with the current method
REQUIRE(C.number_of_congruences(625) == 10);
// NOTE: Never ran to completion, if you do, change the 0 to the answer.
REQUIRE(C.number_of_congruences(625) == 0);
}

LIBSEMIGROUPS_TEST_CASE("Sims1",
Expand All @@ -2145,19 +2142,31 @@ namespace libsemigroups {
std::array<uint64_t, 9> const num
// TODO(2): returns 15 when n=2 instead of 29, why?
= {0, 1, 29, 484, 6'896, 103'204, 1'773'360, 35'874'182, 849'953'461};
auto rg = ReportGuard(true);
auto p = plactic_monoid(3);
auto rg = ReportGuard(true);
auto p = plactic_monoid(3);
Sims1 S, SF;
Presentation<word_type> F;
F.alphabet(3);
for (size_t n = 2; n < 9; ++n) {
{
Sims1 S;
S.presentation(p).number_of_threads(
std::thread::hardware_concurrency());
REQUIRE(S.number_of_congruences(n) == num[n]);
presentation::reverse(p);
S.presentation(p).number_of_threads(
std::thread::hardware_concurrency());
REQUIRE(S.number_of_congruences(n) == num[n]);
}
std::atomic<size_t> count = 0;
S.init(p);
SF.init(F);
SF.number_of_threads(std::thread::hardware_concurrency());
SF.for_each(n, [&n, &p, &count](auto const& wg) {
count += word_graph::is_compatible(wg,
wg.cbegin_nodes(),
wg.cbegin_nodes()
+ wg.number_of_active_nodes(),
p.rules.cbegin(),
p.rules.cend());
});
// REQUIRE(presentation::to_gap_string(p, "S") == "");
REQUIRE(count == num[n]);
S.number_of_threads(1);
REQUIRE(S.number_of_congruences(n) == num[n]);
presentation::reverse(p);
S.presentation(p).number_of_threads(std::thread::hardware_concurrency());
REQUIRE(S.number_of_congruences(n) == num[n]);
}
}

Expand Down Expand Up @@ -2864,7 +2873,7 @@ namespace libsemigroups {
== 6);
}

LIBSEMIGROUPS_TEST_CASE("Sims1", "082", "trivial group", "[fail][sims1]") {
LIBSEMIGROUPS_TEST_CASE("Sims1", "082", "trivial group", "[extreme][sims1]") {
auto rg = ReportGuard();
Presentation<std::string> p;
p.alphabet("rstRST");
Expand All @@ -2878,6 +2887,7 @@ namespace libsemigroups {
tc.strategy(ToddCoxeter::options::strategy::felsch);
// TODO(0) Todd-Coxeter seems to be broken
REQUIRE(tc.number_of_classes() == 1);
tc.shrink_to_fit();
REQUIRE(tc.word_graph().number_of_nodes() == 1);

Sims1 S;
Expand Down

0 comments on commit 0a096e8

Please sign in to comment.