presentation: add making a presentation from FroidurePin

Author: james-d-mitchell

libsemigroups_pybind11/presentation.py

@@ -6,7 +6,7 @@
 #
 # The full license is in the file LICENSE, distributed with this software.
 
-# pylint: disable=no-name-in-module, invalid-name, unused-import
+# pylint: disable=no-name-in-module, invalid-name, unused-import, fixme
 
 """
 This package provides the user-facing python part of libsemigroups_pybind11 for
@@ -32,27 +32,29 @@
     normalize_alphabet,
     redundant_rule_strings,
     redundant_rule_words,
+    FroidurePinBase,
+    make_from_froidure_pin,
 )
 
 
-def Presentation(alphabet):
+def Presentation(arg):
     """
-    Construct a Presentation instance of the type specified by its argument
-    (which is the alphabet to be used).
+    Construct a Presentation instance of the type specified by its argument.
     """
-    if isinstance(alphabet, PresentationStrings):
-        result = PresentationStrings(alphabet)
-    elif isinstance(alphabet, PresentationWords):
-        result = PresentationWords(alphabet)
-    elif isinstance(alphabet, str):
+    if isinstance(arg, PresentationStrings):
+        result = PresentationStrings(arg)
+    elif isinstance(arg, PresentationWords):
+        result = PresentationWords(arg)
+    elif isinstance(arg, str):
         result = PresentationStrings()
-        result.alphabet(alphabet)
-    elif isinstance(alphabet, list) and all(
-        isinstance(x, int) for x in alphabet
-    ):
+        result.alphabet(arg)
+    elif isinstance(arg, list) and all(isinstance(x, int) for x in arg):
         result = PresentationWords()
-        result.alphabet(alphabet)
+        result.alphabet(arg)
+    elif isinstance(arg, FroidurePinBase):
+        result = make_from_froidure_pin(arg)
     else:
+        # TODO update this string
         raise TypeError("expected string or list of ints argument")
     return result
 

src/present.cpp

@@ -28,7 +28,9 @@
 #include <vector>            // for vector
 
 // libsemigroups....
-#include <libsemigroups/present.hpp>  // for Presentation
+#include <libsemigroups/froidure-pin-base.hpp>  // for FroidurePinBase
+#include <libsemigroups/make-present.hpp>       // for make
+#include <libsemigroups/present.hpp>            // for Presentation
 
 // pybind11....
 #include <pybind11/pybind11.h>  // for class_, init, module
@@ -69,28 +71,21 @@ namespace libsemigroups {
                py::overload_cast<size_type>(&Presentation<T>::alphabet))
           .def("alphabet",
                py::overload_cast<T const &>(&Presentation<T>::alphabet))
-          .def("alphabet_from_rules",
-               &Presentation<T>::alphabet_from_rules)
-          .def("letter",
-               &Presentation<T>::letter)
-          .def("index",
-               &Presentation<T>::index)
+          .def("alphabet_from_rules", &Presentation<T>::alphabet_from_rules)
+          .def("letter", &Presentation<T>::letter)
+          .def("index", &Presentation<T>::index)
           .def("contains_empty_word",
                py::overload_cast<>(&Presentation<T>::contains_empty_word,
                                    py::const_))
           .def("contains_empty_word",
                py::overload_cast<bool>(&Presentation<T>::contains_empty_word))
-          .def_readwrite("rules",
-                         &Presentation<T>::rules)
+          .def_readwrite("rules", &Presentation<T>::rules)
           .def("validate_alphabet",
                py::overload_cast<>(&Presentation<T>::validate_alphabet,
                                    py::const_))
-          .def("validate_letter",
-               &Presentation<T>::validate_letter)
-          .def("validate_rules",
-               &Presentation<T>::validate_rules)
-          .def("validate",
-               &Presentation<T>::validate)
+          .def("validate_letter", &Presentation<T>::validate_letter)
+          .def("validate_rules", &Presentation<T>::validate_rules)
+          .def("validate", &Presentation<T>::validate)
           .def("__repr__", &presentation_repr<T>);
 
       m.def("add_rule",
@@ -114,6 +109,10 @@ namespace libsemigroups {
       m.def("reverse", &presentation::reverse<T>);
       m.def("normalize_alphabet", &presentation::normalize_alphabet<T>);
 
+      m.def(
+          "make_from_froidure_pin",
+          py::overload_cast<FroidurePinBase &>(&make<Presentation<word_type>>));
+
       // TODO add make
     }
   }  // namespace