Minor refactor

Author: james-d-mitchell

libsemigroups_pybind11/congruence.py

@@ -42,6 +42,7 @@
     CxxWrapper as _CxxWrapper,
     copy_cxx_mem_fns as _copy_cxx_mem_fns,
     to_cxx as _to_cxx,
+    wrap_cxx_free_fn as _wrap_cxx_free_fn,
 )
 
 
@@ -144,15 +145,5 @@ def number_of_classes(self: Self) -> int:
 _copy_cxx_mem_fns(_CongruenceWord, Congruence)
 
 
-@_copydoc(_congruence_partition)
-def partition(
-    c: Congruence, words: List[List[int]] | List[str]
-) -> List[List[List[int]]] | List[List[str]]:
-    return _congruence_partition(_to_cxx(c), words)
-
-
-@_copydoc(_congruence_non_trivial_classes)
-def non_trivial_classes(
-    c: Congruence, words: List[List[int]] | List[str]
-) -> List[List[List[int]]] | List[List[str]]:
-    return _congruence_non_trivial_classes(c._cxx_obj, words)
+partition = _wrap_cxx_free_fn(_congruence_partition)
+non_trivial_classes = _wrap_cxx_free_fn(_congruence_non_trivial_classes)

libsemigroups_pybind11/detail/cxx_wrapper.py

@@ -174,10 +174,8 @@ def cxx_mem_fn_wrapper(self, *args):
 
 # TODO proper annotations
 def wrap_cxx_free_fn(cxx_free_fn: pybind11_type) -> Callable:
-    def cxx_free_fn_wrapper(self, *args):
-        return getattr(self._cxx_obj, cxx_free_fn.__name__)(
-            *(to_cxx(x) for x in args)
-        )
+    def cxx_free_fn_wrapper(*args):
+        return cxx_free_fn(*(to_cxx(x) for x in args))
 
     cxx_free_fn_wrapper.__name__ = cxx_free_fn.__name__
     cxx_free_fn_wrapper.__doc__ = cxx_free_fn.__doc__

libsemigroups_pybind11/kambites.py

@@ -40,6 +40,7 @@
     CxxWrapper as _CxxWrapper,
     copy_cxx_mem_fns as _copy_cxx_mem_fns,
     to_cxx as _to_cxx,
+    wrap_cxx_free_fn as _wrap_cxx_free_fn,
 )
 
 
@@ -85,20 +86,6 @@ def small_overlap_class(self: Self) -> int:
 _copy_cxx_mem_fns(_KambitesWord, Kambites)
 
 
-@_copydoc(_kambites_partition)
-def partition(
-    k: Kambites, words: List[List[int]] | List[str]
-) -> List[List[List[int]]] | List[List[str]]:
-    return _kambites_partition(_to_cxx(k), words)
-
-
-@_copydoc(_kambites_non_trivial_classes)
-def non_trivial_classes(
-    k: Kambites, words: List[List[int]] | List[str]
-) -> List[List[List[int]]] | List[List[str]]:
-    return _kambites_non_trivial_classes(_to_cxx(k), words)
-
-
-@_copydoc(_kambites_normal_forms)
-def normal_forms(k: Kambites) -> List[List[int]] | List[str]:
-    return _kambites_normal_forms(_to_cxx(k))
+partition = _wrap_cxx_free_fn(_kambites_partition)
+non_trivial_classes = _wrap_cxx_free_fn(_kambites_non_trivial_classes)
+normal_forms = _wrap_cxx_free_fn(_kambites_normal_forms)