Remove keys/values/exponent_tuple functions, rename items -> terms

Author: Jake-Moss

src/flint/flint_base/flint_base.pyx

@@ -242,7 +242,7 @@ cdef class flint_mpoly(flint_elem):
         return self.coefficient(0)
 
     def to_dict(self):
-        return {self.exponent_tuple(i): self.coefficient(i) for i in range(len(self))}
+        return {self.monomial(i): self.coefficient(i) for i in range(len(self))}
 
     def __contains__(self, x):
         """
@@ -265,24 +265,18 @@ 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):
+    def terms(self):
         """
         Return the exponent vectors and coefficient of each term.
 
             >>> from flint import fmpq_mpoly_ctx, 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})
-            >>> list(f.items())
+            >>> list(f.terms())
             [((1, 1), 4), ((1, 0), 2), ((0, 1), 3), ((0, 0), 1)]
 
         """
-        return zip(self.keys(), self.values())
+        return zip(self.monoms(), self.coeffs())
 
 
 cdef class flint_series(flint_elem):

src/flint/test/test_all.py

@@ -2777,10 +2777,10 @@ def quick_poly():
         assert P(1, ctx=ctx).repr() == f"{ctx.__class__.__name__}(2, '<Ordering.lex: 0>', ('x0', 'x1')).from_dict({{(0, 0): 1}})"
         assert str(quick_poly()) == repr(quick_poly()) == '4*x0^2*x1^2 + 3*x0 + 2*x1 + 1'
 
-        assert p.exponent_tuple(0) == (2, 2)
-        assert p.exponent_tuple(3) == (0, 0)
-        assert raises(lambda: p.exponent_tuple(-1), IndexError)
-        assert raises(lambda: p.exponent_tuple(4), IndexError)
+        assert p.monomial(0) == (2, 2)
+        assert p.monomial(3) == (0, 0)
+        assert raises(lambda: p.monomial(-1), IndexError)
+        assert raises(lambda: p.monomial(4), IndexError)
 
         assert p.total_degree() == 4
         assert P(ctx=ctx).total_degree() == -1
@@ -2791,11 +2791,9 @@ def quick_poly():
         assert p(1, 1) == S(10) == 10
 
         p = 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.monoms() == [(2, 2), (1, 0), (0, 1), (0, 0)]
+        assert p.coeffs() == [4, 3, 2, 1]
+        assert list(p.terms()) == list(zip([(2, 2), (1, 0), (0, 1), (0, 0)], [4, 3, 2, 1]))
 
         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

@@ -591,7 +591,7 @@ cdef class fmpq_mpoly(flint_mpoly):
             >>> 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.keys()
+            >>> f.monoms()
             [(1, 1), (1, 0), (0, 1), (0, 0)]
 
         """
@@ -613,7 +613,7 @@ cdef class fmpq_mpoly(flint_mpoly):
             >>> 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.values()
+            >>> f.coeffs()
             [4, 2, 3, 1]
 
         """
@@ -629,28 +629,28 @@ cdef class fmpq_mpoly(flint_mpoly):
 
         return res
 
-    def terms(self):
-        """
-        Return the terms of this polynomial as a list of fmpq_mpolys.
+    # 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]
+    #         >>> 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
+    #     """
+    #     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)
+    #     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
+    #     return res
 
     def subs(self, dict_args) -> fmpq_mpoly:
         """
@@ -744,14 +744,14 @@ cdef class fmpq_mpoly(flint_mpoly):
             fmpq_mpoly_get_term_coeff_fmpq(v.val, self.val, i, self.ctx.val)
             return v
 
-    def exponent_tuple(self, slong i):
+    def monomial(self, slong i):
         """
         Return the exponent vector at index `i` as a tuple.
 
             >>> from flint import Ordering
             >>> ctx = fmpq_mpoly_ctx.get_context(2, Ordering.lex, 'x')
             >>> p = ctx.from_dict({(0, 1): 2, (1, 1): 3})
-            >>> p.exponent_tuple(1)
+            >>> p.monomial(1)
             (0, 1)
         """
         cdef:

src/flint/types/fmpz_mpoly.pyx

@@ -573,7 +573,7 @@ cdef class fmpz_mpoly(flint_mpoly):
             >>> 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.keys()
+            >>> f.monoms()
             [(1, 1), (1, 0), (0, 1), (0, 0)]
 
         """
@@ -595,7 +595,7 @@ cdef class fmpz_mpoly(flint_mpoly):
             >>> 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.values()
+            >>> f.coeffs()
             [4, 2, 3, 1]
 
         """
@@ -611,28 +611,28 @@ cdef class fmpz_mpoly(flint_mpoly):
 
         return res
 
-    def terms(self):
-        """
-        Return the terms of this polynomial as a list of fmpz_mpolys.
+    # 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]
+    #         >>> 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
+    #     """
+    #     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)
+    #     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
+    #     return res
 
     def subs(self, dict_args) -> fmpz_mpoly:
         """
@@ -747,14 +747,14 @@ cdef class fmpz_mpoly(flint_mpoly):
             fmpz_mpoly_get_term_coeff_fmpz(v.val, self.val, i, self.ctx.val)
             return v
 
-    def exponent_tuple(self, slong i):
+    def monomial(self, slong i):
         """
         Return the exponent vector at index `i` as a tuple.
 
             >>> from flint import Ordering
             >>> ctx = fmpz_mpoly_ctx.get_context(2, Ordering.lex, 'x')
             >>> p = ctx.from_dict({(0, 1): 2, (1, 1): 3})
-            >>> p.exponent_tuple(1)
+            >>> p.monomial(1)
             (0, 1)
         """
         cdef: