Skip to content

Commit 604441c

Browse files
james-d-mitchelljames-d-mitchell
committed
Remove detail stuff removed upstream
1 parent 47ca327 commit 604441c

3 files changed

Lines changed: 1 addition & 65 deletions

File tree

‎src/cong-common.cpp‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,6 @@ This function adds a generating pair to the congruence represented by a
593593
template void def_add_generating_pair<A, B>( \
594594
py::class_<A, B>&, std::string_view, doc)
595595

596-
DEF_ADD_GENERATING_PAIR(detail::ToddCoxeterImpl, detail::CongruenceCommon);
597-
598596
DEF_ADD_GENERATING_PAIR(ToddCoxeter<word_type>, detail::ToddCoxeterImpl);
599597
DEF_ADD_GENERATING_PAIR(ToddCoxeter<std::string>, detail::ToddCoxeterImpl);
600598

@@ -603,11 +601,6 @@ This function adds a generating pair to the congruence represented by a
603601
detail::CongruenceCommon);
604602
DEF_ADD_GENERATING_PAIR(Kambites<std::string>, detail::CongruenceCommon);
605603

606-
DEF_ADD_GENERATING_PAIR(detail::KnuthBendixImpl<LenLexTrie>,
607-
detail::CongruenceCommon);
608-
DEF_ADD_GENERATING_PAIR(detail::KnuthBendixImpl<LenLexSet>,
609-
detail::CongruenceCommon);
610-
611604
DEF_ADD_GENERATING_PAIR(KnuthBendixStringLenLexTrie,
612605
detail::KnuthBendixImpl<LenLexTrie>);
613606
DEF_ADD_GENERATING_PAIR(KnuthBendixStringLenLexSet,
@@ -617,11 +610,6 @@ This function adds a generating pair to the congruence represented by a
617610
DEF_ADD_GENERATING_PAIR(KnuthBendixWordLenLexSet,
618611
detail::KnuthBendixImpl<LenLexSet>);
619612

620-
DEF_ADD_GENERATING_PAIR(detail::KnuthBendixImpl<RevRPOTrie>,
621-
detail::CongruenceCommon);
622-
DEF_ADD_GENERATING_PAIR(detail::KnuthBendixImpl<RevRPOSet>,
623-
detail::CongruenceCommon);
624-
625613
DEF_ADD_GENERATING_PAIR(KnuthBendixStringRevRPOTrie,
626614
detail::KnuthBendixImpl<RevRPOTrie>);
627615
DEF_ADD_GENERATING_PAIR(KnuthBendixStringRevRPOSet,
@@ -690,8 +678,6 @@ contained in the congruence, but that this is not currently known.
690678
template void def_currently_contains<A, B>( \
691679
py::class_<A, B>&, std::string_view, doc)
692680

693-
DEF_CURRENTLY_CONTAINS(detail::ToddCoxeterImpl, detail::CongruenceCommon);
694-
695681
DEF_CURRENTLY_CONTAINS(ToddCoxeter<word_type>, detail::ToddCoxeterImpl);
696682
DEF_CURRENTLY_CONTAINS(ToddCoxeter<std::string>, detail::ToddCoxeterImpl);
697683

@@ -700,11 +686,6 @@ contained in the congruence, but that this is not currently known.
700686
detail::CongruenceCommon);
701687
DEF_CURRENTLY_CONTAINS(Kambites<std::string>, detail::CongruenceCommon);
702688

703-
DEF_CURRENTLY_CONTAINS(detail::KnuthBendixImpl<LenLexTrie>,
704-
detail::CongruenceCommon);
705-
DEF_CURRENTLY_CONTAINS(detail::KnuthBendixImpl<LenLexSet>,
706-
detail::CongruenceCommon);
707-
708689
DEF_CURRENTLY_CONTAINS(KnuthBendixStringLenLexTrie,
709690
detail::KnuthBendixImpl<LenLexTrie>);
710691
DEF_CURRENTLY_CONTAINS(KnuthBendixStringLenLexSet,
@@ -714,11 +695,6 @@ contained in the congruence, but that this is not currently known.
714695
DEF_CURRENTLY_CONTAINS(KnuthBendixWordLenLexSet,
715696
detail::KnuthBendixImpl<LenLexSet>);
716697

717-
DEF_CURRENTLY_CONTAINS(detail::KnuthBendixImpl<RevRPOTrie>,
718-
detail::CongruenceCommon);
719-
DEF_CURRENTLY_CONTAINS(detail::KnuthBendixImpl<RevRPOSet>,
720-
detail::CongruenceCommon);
721-
722698
DEF_CURRENTLY_CONTAINS(KnuthBendixStringRevRPOTrie,
723699
detail::KnuthBendixImpl<RevRPOTrie>);
724700
DEF_CURRENTLY_CONTAINS(KnuthBendixStringRevRPOSet,
@@ -781,27 +757,19 @@ congruence represented by a :py:class:`{name}` instance.
781757
#define DEF_CONTAINS(A, B) \
782758
template void def_contains<A, B>(py::class_<A, B>&, std::string_view, doc)
783759

784-
DEF_CONTAINS(detail::ToddCoxeterImpl, detail::CongruenceCommon);
785-
786760
DEF_CONTAINS(ToddCoxeter<word_type>, detail::ToddCoxeterImpl);
787761
DEF_CONTAINS(ToddCoxeter<std::string>, detail::ToddCoxeterImpl);
788762

789763
DEF_CONTAINS(Kambites<word_type>, detail::CongruenceCommon);
790764
DEF_CONTAINS(Kambites<MultiView<std::string>>, detail::CongruenceCommon);
791765
DEF_CONTAINS(Kambites<std::string>, detail::CongruenceCommon);
792766

793-
DEF_CONTAINS(detail::KnuthBendixImpl<LenLexTrie>, detail::CongruenceCommon);
794-
DEF_CONTAINS(detail::KnuthBendixImpl<LenLexSet>, detail::CongruenceCommon);
795-
796767
DEF_CONTAINS(KnuthBendixStringLenLexTrie,
797768
detail::KnuthBendixImpl<LenLexTrie>);
798769
DEF_CONTAINS(KnuthBendixStringLenLexSet, detail::KnuthBendixImpl<LenLexSet>);
799770
DEF_CONTAINS(KnuthBendixWordLenLexTrie, detail::KnuthBendixImpl<LenLexTrie>);
800771
DEF_CONTAINS(KnuthBendixWordLenLexSet, detail::KnuthBendixImpl<LenLexSet>);
801772

802-
DEF_CONTAINS(detail::KnuthBendixImpl<RevRPOTrie>, detail::CongruenceCommon);
803-
DEF_CONTAINS(detail::KnuthBendixImpl<RevRPOSet>, detail::CongruenceCommon);
804-
805773
DEF_CONTAINS(KnuthBendixStringRevRPOTrie,
806774
detail::KnuthBendixImpl<RevRPOTrie>);
807775
DEF_CONTAINS(KnuthBendixStringRevRPOSet, detail::KnuthBendixImpl<RevRPOSet>);
@@ -858,20 +826,13 @@ normal form for the input word *w*.
858826
template void def_reduce_no_run<A, B>( \
859827
py::class_<A, B>&, std::string_view, doc)
860828

861-
DEF_REDUCE_NO_RUN(detail::ToddCoxeterImpl, detail::CongruenceCommon);
862-
863829
DEF_REDUCE_NO_RUN(ToddCoxeter<word_type>, detail::ToddCoxeterImpl);
864830
DEF_REDUCE_NO_RUN(ToddCoxeter<std::string>, detail::ToddCoxeterImpl);
865831

866832
DEF_REDUCE_NO_RUN(Kambites<word_type>, detail::CongruenceCommon);
867833
DEF_REDUCE_NO_RUN(Kambites<MultiView<std::string>>, detail::CongruenceCommon);
868834
DEF_REDUCE_NO_RUN(Kambites<std::string>, detail::CongruenceCommon);
869835

870-
DEF_REDUCE_NO_RUN(detail::KnuthBendixImpl<LenLexTrie>,
871-
detail::CongruenceCommon);
872-
DEF_REDUCE_NO_RUN(detail::KnuthBendixImpl<LenLexSet>,
873-
detail::CongruenceCommon);
874-
875836
DEF_REDUCE_NO_RUN(KnuthBendixStringLenLexTrie,
876837
detail::KnuthBendixImpl<LenLexTrie>);
877838
DEF_REDUCE_NO_RUN(KnuthBendixStringLenLexSet,
@@ -881,11 +842,6 @@ normal form for the input word *w*.
881842
DEF_REDUCE_NO_RUN(KnuthBendixWordLenLexSet,
882843
detail::KnuthBendixImpl<LenLexSet>);
883844

884-
DEF_REDUCE_NO_RUN(detail::KnuthBendixImpl<RevRPOTrie>,
885-
detail::CongruenceCommon);
886-
DEF_REDUCE_NO_RUN(detail::KnuthBendixImpl<RevRPOSet>,
887-
detail::CongruenceCommon);
888-
889845
DEF_REDUCE_NO_RUN(KnuthBendixStringRevRPOTrie,
890846
detail::KnuthBendixImpl<RevRPOTrie>);
891847
DEF_REDUCE_NO_RUN(KnuthBendixStringRevRPOSet,
@@ -946,26 +902,18 @@ input word.
946902
#define DEF_REDUCE(A, B) \
947903
template void def_reduce<A, B>(py::class_<A, B>&, std::string_view, doc)
948904

949-
DEF_REDUCE(detail::ToddCoxeterImpl, detail::CongruenceCommon);
950-
951905
DEF_REDUCE(ToddCoxeter<word_type>, detail::ToddCoxeterImpl);
952906
DEF_REDUCE(ToddCoxeter<std::string>, detail::ToddCoxeterImpl);
953907

954908
DEF_REDUCE(Kambites<word_type>, detail::CongruenceCommon);
955909
DEF_REDUCE(Kambites<MultiView<std::string>>, detail::CongruenceCommon);
956910
DEF_REDUCE(Kambites<std::string>, detail::CongruenceCommon);
957911

958-
DEF_REDUCE(detail::KnuthBendixImpl<LenLexTrie>, detail::CongruenceCommon);
959-
DEF_REDUCE(detail::KnuthBendixImpl<LenLexSet>, detail::CongruenceCommon);
960-
961912
DEF_REDUCE(KnuthBendixStringLenLexTrie, detail::KnuthBendixImpl<LenLexTrie>);
962913
DEF_REDUCE(KnuthBendixStringLenLexSet, detail::KnuthBendixImpl<LenLexSet>);
963914
DEF_REDUCE(KnuthBendixWordLenLexTrie, detail::KnuthBendixImpl<LenLexTrie>);
964915
DEF_REDUCE(KnuthBendixWordLenLexSet, detail::KnuthBendixImpl<LenLexSet>);
965916

966-
DEF_REDUCE(detail::KnuthBendixImpl<RevRPOTrie>, detail::CongruenceCommon);
967-
DEF_REDUCE(detail::KnuthBendixImpl<RevRPOSet>, detail::CongruenceCommon);
968-
969917
DEF_REDUCE(KnuthBendixStringRevRPOTrie, detail::KnuthBendixImpl<RevRPOTrie>);
970918
DEF_REDUCE(KnuthBendixStringRevRPOSet, detail::KnuthBendixImpl<RevRPOSet>);
971919
DEF_REDUCE(KnuthBendixWordRevRPOTrie, detail::KnuthBendixImpl<RevRPOTrie>);

‎src/knuth-bendix-impl.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ The valid values are:
118118
def_copy(thing, "KnuthBendix");
119119
// The next function has a reference hence the different "KnuthBendix".
120120
def_number_of_classes(thing, "KnuthBendix");
121-
def_add_generating_pair(thing, "KnuthBendix");
122-
def_contains(thing, "KnuthBendix");
123-
def_currently_contains(thing, "KnuthBendix");
124-
def_reduce_no_run(thing, "KnuthBendix");
125-
def_reduce(thing, "KnuthBendix");
126121

127122
// Not exposed in the doc
128123
thing.def("internal_presentation",

‎src/todd-coxeter-impl.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,14 +260,7 @@ The valid values are:
260260
def_init_kind_presentation(thing, "ToddCoxeterImpl_");
261261
def_number_of_classes(thing, "ToddCoxeter");
262262
def_copy(thing, "ToddCoxeterImpl_");
263-
def_add_generating_pair(thing, "ToddCoxeterImpl_");
264-
def_currently_contains(thing, "ToddCoxeterImpl_");
265-
def_contains(thing, "ToddCoxeterImpl_");
266-
def_reduce_no_run(thing, "ToddCoxeterImpl_", doc{.detail = R"pbdoc(
267-
If the :any:`ToddCoxeter` instance is not :any:`Runner.finished`,
268-
then it might be that equivalent input words produce different output
269-
words. This function triggers no congruence enumeration.)pbdoc"sv});
270-
def_reduce(thing, "ToddCoxeterImpl_");
263+
271264
// There's no generating_pairs for ToddCoxeterImpl_ only
272265
// internal_generating_pairs
273266

0 commit comments

Comments
 (0)