Add alias for keys/value to monoms/coeffs, add terms function

Author: Jake-Moss

src/flint/flint_base/flint_base.pyx

@@ -265,6 +265,12 @@ cdef class flint_mpoly(flint_elem):
     def __pos__(self):
         return self
 
+    def keys(self):
+        return self.monoms()
+
+    def values(self):
+        return self.coeffs()
+
     def items(self):
         """
         Return the exponent vectors and coefficient of each term.

src/flint/test/test_all.py

@@ -2794,6 +2794,8 @@ def quick_poly():
         assert p.keys() == [(2, 2), (1, 0), (0, 1), (0, 0)]
         assert p.values() == [4, 3, 2, 1]
         assert list(p.items()) == list(zip([(2, 2), (1, 0), (0, 1), (0, 0)], [4, 3, 2, 1]))
+        assert sum(ctx.from_dict({exp_vec: coeff}) for exp_vec, coeff in p.items()) == p
+        assert sum(p.terms()) == p
 
         assert p.subs({"x1": S(0), "x0": S(0)}) == ctx.from_dict({(0, 0): 1})
         assert p.compose(p.subs({"x1": 0}), ctx.from_dict({(0, 1): 1})) == mpoly({

src/flint/types/fmpq_mpoly.pyx

@@ -584,7 +584,7 @@ cdef class fmpq_mpoly(flint_mpoly):
             raise ValueError("Unreasonably large polynomial")  # pragma: no cover
         return vres
 
-    def keys(self):
+    def monoms(self):
         """
         Return the exponent vectors of each term as a tuple of fmpz.
 
@@ -606,7 +606,7 @@ cdef class fmpq_mpoly(flint_mpoly):
 
         return res
 
-    def values(self):
+    def coeffs(self):
         """
         Return the coefficients of each term as a fmpq.
 
@@ -629,6 +629,29 @@ cdef class fmpq_mpoly(flint_mpoly):
 
         return res
 
+    def terms(self):
+        """
+        Return the terms of this polynomial as a list of fmpq_mpolys.
+
+            >>> from flint import Ordering
+            >>> ctx = fmpq_mpoly_ctx.get_context(2, Ordering.lex, 'x')
+            >>> f = ctx.from_dict({(0, 0): 1, (1, 0): 2, (0, 1): 3, (1, 1): 4})
+            >>> f.terms()
+            [4*x0*x1, 2*x0, 3*x1, 1]
+
+        """
+        cdef:
+            fmpq_mpoly term
+            slong i
+
+        res = []
+        for i in range(len(self)):
+            term = create_fmpq_mpoly(self.ctx)
+            fmpq_mpoly_get_term(term.val, self.val, i, self.ctx.val)
+            res.append(term)
+
+        return res
+
     def subs(self, dict_args) -> fmpq_mpoly:
         """
         Partial evaluate this polynomial.

src/flint/types/fmpz_mpoly.pyx

@@ -566,7 +566,7 @@ cdef class fmpz_mpoly(flint_mpoly):
             raise ValueError("Unreasonably large polynomial")  # pragma: no cover
         return vres
 
-    def keys(self):
+    def monoms(self):
         """
         Return the exponent vectors of each term as a tuple of fmpz.
 
@@ -588,7 +588,7 @@ cdef class fmpz_mpoly(flint_mpoly):
 
         return res
 
-    def values(self):
+    def coeffs(self):
         """
         Return the coefficients of each term as a fmpz
 
@@ -611,6 +611,29 @@ cdef class fmpz_mpoly(flint_mpoly):
 
         return res
 
+    def terms(self):
+        """
+        Return the terms of this polynomial as a list of fmpz_mpolys.
+
+            >>> from flint import Ordering
+            >>> ctx = fmpz_mpoly_ctx.get_context(2, Ordering.lex, 'x')
+            >>> f = ctx.from_dict({(0, 0): 1, (1, 0): 2, (0, 1): 3, (1, 1): 4})
+            >>> f.terms()
+            [4*x0*x1, 2*x0, 3*x1, 1]
+
+        """
+        cdef:
+            fmpz_mpoly term
+            slong i
+
+        res = []
+        for i in range(len(self)):
+            term = create_fmpz_mpoly(self.ctx)
+            fmpz_mpoly_get_term(term.val, self.val, i, self.ctx.val)
+            res.append(term)
+
+        return res
+
     def subs(self, dict_args) -> fmpz_mpoly:
         """
         Partial evaluate this polynomial with select constants. All arguments must be fmpz.