feat: add gr poly, mpoly and series types

Author: oscarbenjamin

src/flint/types/_gr.pxd

@@ -11,6 +11,9 @@ from flint.flintlib.types.fmpz cimport (
 from flint.flintlib.types.fmpq cimport (
     fmpq_poly_t,
 )
+from flint.flintlib.types.mpoly cimport (
+    ordering_t,
+)
 from flint.flintlib.functions.ulong_extras cimport (
     n_is_prime,
 )
@@ -26,6 +29,7 @@ from flint.flintlib.functions.fmpq_poly cimport (
     fmpq_poly_set,
 )
 
+
 from flint.flintlib.types.gr cimport (
     truth_t,
     T_TRUE,
@@ -44,6 +48,7 @@ from flint.flintlib.functions.gr_domains cimport (
     gr_ctx_init_fmpz,
     gr_ctx_init_fmpq,
     gr_ctx_init_fmpzi,
+    gr_ctx_init_fexpr,
 
     gr_ctx_init_nmod,
     gr_ctx_init_fmpz_mod,
@@ -71,8 +76,12 @@ from flint.flintlib.functions.gr_domains cimport (
 
     gr_ctx_init_real_arb,
     gr_ctx_init_complex_acb,
-    gr_ctx_init_fexpr,
 
+    gr_ctx_init_gr_poly,
+    gr_ctx_init_gr_mpoly,
+    gr_ctx_init_fmpz_mpoly_q,
+    # gr_ctx_init_series_mod_gr_poly,
+    gr_ctx_init_gr_series,
 )
 from flint.flintlib.functions.gr cimport (
     gr_heap_init,
@@ -150,7 +159,12 @@ from flint.flintlib.functions.gr_vec cimport (
     gr_vec_entry_ptr,
 )
 
-from flint.flint_base.flint_base cimport flint_ctx, flint_scalar
+from flint.flint_base.flint_base cimport (
+    flint_ctx,
+    flint_scalar,
+    Ordering,
+    ordering_py_to_c,
+)
 
 from flint.types.fmpz cimport fmpz
 from flint.types.fmpz_poly cimport fmpz_poly
@@ -314,7 +328,7 @@ cdef class gr_ctx(flint_ctx):
         return res
 
     @cython.final
-    cdef inline _gens(self):
+    cdef inline list _gens(self):
         cdef int err
         cdef gr g
         cdef gr_vec_t gens
@@ -334,7 +348,7 @@ cdef class gr_ctx(flint_ctx):
         return py_gens
 
     @cython.final
-    cdef inline gr _gens_recursive(self):
+    cdef inline list _gens_recursive(self):
         cdef int err
         cdef gr g
         cdef gr_vec_t gens
@@ -749,6 +763,90 @@ cdef class gr_complex_acb_ctx(gr_scalar_ctx):
 #     cdef _gr_gr_poly_ctx _new()
 
 
+@cython.no_gc
+cdef class gr_gr_poly_ctx(gr_poly_ctx):
+    cdef gr_ctx base_ctx
+
+    @staticmethod
+    cdef inline gr_gr_poly_ctx _new(gr_ctx base_ctx):
+        cdef gr_gr_poly_ctx ctx
+        ctx = gr_gr_poly_ctx.__new__(gr_gr_poly_ctx)
+        gr_ctx_init_gr_poly(ctx.ctx_t, base_ctx.ctx_t)
+        ctx._init = True
+        ctx.base_ctx = base_ctx
+        return ctx
+
+
+@cython.no_gc
+cdef class gr_gr_mpoly_ctx(gr_mpoly_ctx):
+    cdef gr_ctx base_ctx
+    cdef ordering_t _order
+    cdef slong _nvars
+
+    @staticmethod
+    cdef inline gr_gr_mpoly_ctx _new(gr_ctx base_ctx, slong nvars, Ordering order):
+        cdef gr_gr_mpoly_ctx ctx
+        cdef ordering_t ord_c
+        ord_c = ordering_py_to_c(order)
+        ctx = gr_gr_mpoly_ctx.__new__(gr_gr_mpoly_ctx)
+        gr_ctx_init_gr_mpoly(ctx.ctx_t, base_ctx.ctx_t, nvars, ord_c)
+        ctx._init = True
+        ctx.base_ctx = base_ctx
+        ctx._order = ord_c
+        ctx._nvars = nvars
+        return ctx
+
+
+# @cython.no_gc
+# cdef class gr_fmpz_mpoly_q_ctx(gr_mpoly_ctx):
+#     cdef ordering_t _order
+#     cdef slong _nvars
+#
+#     @staticmethod
+#     cdef inline gr_fmpz_mpoly_q_ctx _new(slong nvars, Ordering order):
+#         cdef gr_fmpz_mpoly_q_ctx ctx
+#         cdef ordering_t ord_c
+#         ord_c = ordering_py_to_c(order)
+#         ctx = gr_fmpz_mpoly_q_ctx.__new__(gr_fmpz_mpoly_q_ctx)
+#         gr_ctx_init_fmpz_mpoly_q(ctx.ctx_t, nvars, ord_c)
+#         ctx._init = True
+#         ctx._order = ord_c
+#         ctx._nvars = nvars
+#         return ctx
+
+
+# @cython.no_gc
+# cdef class gr_series_mod_gr_poly_ctx(gr_ctx):
+#     cdef gr_ctx base_ctx
+#     cdef slong _n
+#
+#     @staticmethod
+#     cdef inline gr_series_mod_gr_poly_ctx _new(gr_ctx base_ctx, slong n):
+#         cdef gr_series_mod_gr_poly_ctx ctx
+#         ctx = gr_series_mod_gr_poly_ctx.__new__(gr_series_mod_gr_poly_ctx)
+#         gr_ctx_init_series_mod_gr_poly(ctx.ctx_t, base_ctx.ctx_t, n)
+#         ctx._init = True
+#         ctx.base_ctx = base_ctx
+#         ctx._n = n
+#         return ctx
+
+
+@cython.no_gc
+cdef class gr_series_ctx(gr_ctx):
+    cdef gr_ctx base_ctx
+    cdef slong _prec
+
+    @staticmethod
+    cdef inline gr_series_ctx _new(gr_ctx base_ctx, slong prec):
+        cdef gr_series_ctx ctx
+        ctx = gr_series_ctx.__new__(gr_series_ctx)
+        gr_ctx_init_gr_series(ctx.ctx_t, base_ctx.ctx_t, prec)
+        ctx._init = True
+        ctx.base_ctx = base_ctx
+        ctx._prec = prec
+        return ctx
+
+
 @cython.no_gc
 cdef class gr(flint_scalar):
     cdef gr_ptr pval

src/flint/types/_gr.pyx

@@ -27,6 +27,8 @@ from flint.flintlib.functions.gr_domains cimport (
     gr_ctx_get_real_prec,
 )
 
+from flint.flint_base.flint_base cimport Ordering, ordering_c_to_py
+
 
 @cython.no_gc
 cdef class gr_ctx(flint_ctx):
@@ -517,6 +519,105 @@ cdef class gr_complex_acb_ctx(gr_scalar_ctx):
         return f"gr_complex_acb_ctx({self.prec})"
 
 
+@cython.no_gc
+cdef class gr_gr_poly_ctx(gr_poly_ctx):
+
+    @staticmethod
+    def new(base_ring) -> gr_gr_poly_ctx:
+        return gr_gr_poly_ctx._new(base_ring)
+
+    def __repr__(self):
+        return f"gr_gr_poly_ctx({self.base_ring})"
+
+    @property
+    def base_ring(self):
+        return self.base_ctx
+
+
+@cython.no_gc
+cdef class gr_gr_mpoly_ctx(gr_mpoly_ctx):
+
+    @staticmethod
+    def new(base_ring, nvars, order=None) -> gr_gr_mpoly_ctx:
+        if order is None:
+            order = Ordering.lex
+        return gr_gr_mpoly_ctx._new(base_ring, nvars, order)
+
+    def __repr__(self):
+        return f"gr_gr_mpoly_ctx({self.base_ring}, {self.nvars}, {self.order})"
+
+    @property
+    def base_ring(self):
+        return self.base_ctx
+
+    @property
+    def nvars(self):
+        return self._nvars
+
+    @property
+    def order(self):
+        return ordering_c_to_py(self._order)
+
+
+# @cython.no_gc
+# cdef class gr_mpoly_q_ctx(gr_mpoly_ctx):
+#
+#     @staticmethod
+#     def new(nvars, order=None) -> gr_gr_mpoly_q_ctx:
+#         if order is None:
+#             order = Ordering.lex
+#         return gr_mpoly_q_ctx._new(nvars, order)
+#
+#     def __repr__(self):
+#         return f"gr_mpoly_q_ctx({self.nvars}, {self.order})"
+#
+#     @property
+#     def nvars(self):
+#         return self._nvars
+#
+#     @property
+#     def order(self):
+#         return ordering_c_to_py(self._order)
+
+
+# @cython.no_gc
+# cdef class gr_series_mod_gr_poly_ctx(gr_ctx):
+#
+#     @staticmethod
+#     def new(base_ring, n) -> gr_series_mod_gr_poly_ctx:
+#         return gr_series_mod_gr_poly_ctx._new(base_ring, n)
+#
+#     def __repr__(self):
+#         return f"gr_series_mod_gr_poly_ctx({self.base_ring}, {self.nvars})"
+#
+#     @property
+#     def base_ring(self):
+#         return self.base_ctx
+#
+#     @property
+#     def n(self):
+#         return self._n
+
+
+@cython.no_gc
+cdef class gr_series_ctx(gr_ctx):
+
+    @staticmethod
+    def new(base_ring, prec) -> gr_series_ctx:
+        return gr_series_ctx._new(base_ring, prec)
+
+    def __repr__(self):
+        return f"gr_series_mod_gr_poly_ctx({self.base_ring}, {self.prec})"
+
+    @property
+    def base_ring(self):
+        return self.base_ctx
+
+    @property
+    def prec(self):
+        return self._prec
+
+
 @cython.no_gc
 cdef class gr(flint_scalar):
 
@@ -636,7 +737,7 @@ cdef class gr(flint_scalar):
         cdef gr other_gr
         if isinstance(other, gr):
             other_gr = other
-            if self.ctx != other._grctx:
+            if self.ctx != other_gr.ctx:
                 raise ValueError("Cannot multiply elements from different contexts")
             return self._mul(other_gr)
         elif isinstance(other, int):