More nmod interop

Author: Jake-Moss

src/flint/test/test_all.py

@@ -2994,6 +2994,12 @@ def quick_poly():
             assert quick_poly() % 1 == P(ctx=ctx)
             assert divmod(quick_poly(), 1) == (quick_poly(), P(ctx=ctx))
 
+            assert S(1) / P(1, ctx=ctx) == P(1, ctx=ctx)
+            assert quick_poly() / S(1) == quick_poly()
+            assert quick_poly() // S(1) == quick_poly()
+            assert quick_poly() % S(1) == P(ctx=ctx)
+            assert divmod(quick_poly(), S(1)) == (quick_poly(), P(ctx=ctx))
+
         if is_field:
             if (P is flint.fmpz_mod_mpoly or P is flint.nmod_mpoly):
                 assert quick_poly() / 3 == mpoly({(0, 0): S(34), (0, 1): S(68), (1, 0): S(1), (2, 2): S(35)})
@@ -3011,6 +3017,10 @@ def quick_poly():
             assert 1 % quick_poly() == P(1, ctx=ctx)
             assert divmod(1, quick_poly()) == (P(ctx=ctx), P(1, ctx=ctx))
 
+            assert S(1) // quick_poly() == P(ctx=ctx)
+            assert S(1) % quick_poly() == P(1, ctx=ctx)
+            assert divmod(S(1), quick_poly()) == (P(ctx=ctx), P(1, ctx=ctx))
+
             assert raises(lambda: quick_poly() / None, TypeError)
             assert raises(lambda: quick_poly() // None, TypeError)
             assert raises(lambda: quick_poly() % None, TypeError)

src/flint/types/nmod_mpoly.pyx

@@ -291,7 +291,7 @@ cdef class nmod_mpoly(flint_mpoly):
                 return op == Py_NE
         elif typecheck(other, nmod):
             if other.modulus() != self.ctx.modulus():
-                raise ValueError(f"cannot compare different modulus {other.modulus()} vs {self.ctx.modulus()}")
+                raise ValueError(f"cannot compare with different modulus {other.modulus()} vs {self.ctx.modulus()}")
             return (op == Py_NE) ^ <bint>nmod_mpoly_equal_ui(self.val, int(other), self.ctx.val)
         elif isinstance(other, int):
             return (op == Py_NE) ^ <bint>nmod_mpoly_equal_ui(self.val, other, self.ctx.val)
@@ -364,6 +364,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_add(res.val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, res.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot add with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_add_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return res
         elif isinstance(other, int):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_add_ui(res.val, (<nmod_mpoly>self).val, other, self.ctx.val)
@@ -377,6 +383,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_add_ui(res.val, (<nmod_mpoly>self).val, other, self.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot add with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_add_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return res
         else:
             return NotImplemented
 
@@ -388,6 +400,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_sub(res.val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, res.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot subtract with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_sub_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return res
         elif isinstance(other, int):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_sub_ui(res.val, (<nmod_mpoly>self).val, other, self.ctx.val)
@@ -401,6 +419,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_sub_ui(res.val, (<nmod_mpoly>self).val, other, res.ctx.val)
             return -res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot subtract with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_sub_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return -res
         else:
             return NotImplemented
 
@@ -412,6 +436,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_mul(res.val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, res.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot multiply with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_scalar_mul_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return res
         elif isinstance(other, int):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_scalar_mul_ui(res.val, (<nmod_mpoly>self).val, other, res.ctx.val)
@@ -425,6 +455,12 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_scalar_mul_ui(res.val, (<nmod_mpoly>self).val, other, res.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot multiply with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_scalar_mul_ui(res.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
+            return res
         else:
             return NotImplemented
 
@@ -464,6 +500,18 @@ cdef class nmod_mpoly(flint_mpoly):
             o = create_nmod_mpoly(self.ctx)
             nmod_mpoly_set_ui(o.val, other, o.ctx.val)
 
+            res = create_nmod_mpoly(self.ctx)
+            res2 = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_divrem(res.val, res2.val, (<nmod_mpoly>self).val, o.val, res.ctx.val)
+            return (res, res2)
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            elif not other:
+                raise ZeroDivisionError("nmod_mpoly division by zero")
+            o = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(o.val, int(other), o.ctx.val)
+
             res = create_nmod_mpoly(self.ctx)
             res2 = create_nmod_mpoly(self.ctx)
             nmod_mpoly_divrem(res.val, res2.val, (<nmod_mpoly>self).val, o.val, res.ctx.val)
@@ -481,6 +529,16 @@ cdef class nmod_mpoly(flint_mpoly):
             o = create_nmod_mpoly(self.ctx)
             nmod_mpoly_set_ui(o.val, other, o.ctx.val)
 
+            res = create_nmod_mpoly(self.ctx)
+            res2 = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_divrem(res.val, res2.val, o.val, (<nmod_mpoly>self).val, res.ctx.val)
+            return (res, res2)
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            o = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(o.val, int(other), o.ctx.val)
+
             res = create_nmod_mpoly(self.ctx)
             res2 = create_nmod_mpoly(self.ctx)
             nmod_mpoly_divrem(res.val, res2.val, o.val, (<nmod_mpoly>self).val, res.ctx.val)
@@ -506,6 +564,17 @@ cdef class nmod_mpoly(flint_mpoly):
             o = create_nmod_mpoly(self.ctx)
             nmod_mpoly_set_ui(o.val, other, o.ctx.val)
 
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_div(res.val, (<nmod_mpoly>self).val, o.val, res.ctx.val)
+            return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            elif not other:
+                raise ZeroDivisionError("nmod_mpoly division by zero")
+            o = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(o.val, int(other), o.ctx.val)
+
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_div(res.val, (<nmod_mpoly>self).val, o.val, res.ctx.val)
             return res
@@ -525,6 +594,15 @@ cdef class nmod_mpoly(flint_mpoly):
             res = create_nmod_mpoly(self.ctx)
             nmod_mpoly_div(res.val, o.val,  self.val, res.ctx.val)
             return res
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            o = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(o.val, int(other), o.ctx.val)
+
+            res = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_div(res.val, o.val, self.val, res.ctx.val)
+            return res
         else:
             return NotImplemented
 
@@ -555,6 +633,18 @@ cdef class nmod_mpoly(flint_mpoly):
                 return res
             else:
                 raise DomainError("nmod_mpoly division is not exact")
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            elif not other:
+                raise ZeroDivisionError("nmod_mpoly division by zero")
+            res = create_nmod_mpoly(self.ctx)
+            div = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(div.val, int(other), self.ctx.val)
+            if nmod_mpoly_divides(res.val, self.val, div.val, self.ctx.val):
+                return res
+            else:
+                raise DomainError("nmod_mpoly division is not exact")
         else:
             return NotImplemented
 
@@ -572,6 +662,16 @@ cdef class nmod_mpoly(flint_mpoly):
                 return res
             else:
                 raise DomainError("nmod_mpoly division is not exact")
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot divide with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            res = create_nmod_mpoly(self.ctx)
+            div = create_nmod_mpoly(self.ctx)
+            nmod_mpoly_set_ui(div.val, int(other), self.ctx.val)
+            if nmod_mpoly_divides(res.val, div.val, self.val, self.ctx.val):
+                return res
+            else:
+                raise DomainError("nmod_mpoly division is not exact")
         else:
             return NotImplemented
 
@@ -625,6 +725,10 @@ cdef class nmod_mpoly(flint_mpoly):
             nmod_mpoly_add((<nmod_mpoly>self).val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, self.ctx.val)
         elif isinstance(other, int):
             nmod_mpoly_add_ui((<nmod_mpoly>self).val, (<nmod_mpoly>self).val, other, self.ctx.val)
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot add with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            nmod_mpoly_add_ui(self.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
         else:
             raise NotImplementedError(f"cannot add {type(other)} to nmod_mpoly")
 
@@ -648,6 +752,10 @@ cdef class nmod_mpoly(flint_mpoly):
             nmod_mpoly_sub((<nmod_mpoly>self).val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, self.ctx.val)
         elif isinstance(other, int):
             nmod_mpoly_sub_ui((<nmod_mpoly>self).val, (<nmod_mpoly>self).val, other, self.ctx.val)
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot subtract with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            nmod_mpoly_sub_ui(self.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
         else:
             raise NotImplementedError(f"cannot subtract {type(other)} from nmod_mpoly")
 
@@ -671,6 +779,10 @@ cdef class nmod_mpoly(flint_mpoly):
             nmod_mpoly_mul((<nmod_mpoly>self).val, (<nmod_mpoly>self).val, (<nmod_mpoly>other).val, self.ctx.val)
         elif isinstance(other, int):
             nmod_mpoly_scalar_mul_ui(self.val, (<nmod_mpoly>self).val, other, self.ctx.val)
+        elif typecheck(other, nmod):
+            if other.modulus() != self.ctx.modulus():
+                raise ValueError(f"cannot multiply with different modulus {other.modulus()} vs {self.ctx.modulus()}")
+            nmod_mpoly_scalar_mul_ui(self.val, (<nmod_mpoly>self).val, int(other), self.ctx.val)
         else:
             raise NotImplementedError(f"cannot multiple nmod_mpoly by {type(other)}")
 
@@ -748,9 +860,9 @@ cdef class nmod_mpoly(flint_mpoly):
             nmod_mpoly res
             slong i
 
-        args = tuple((self.ctx.variable_to_index(k), v) for k, v in dict_args.items())
+        args = tuple((self.ctx.variable_to_index(k), int(v)) for k, v in dict_args.items())
         for _, v in args:
-            if not (isinstance(v, int) and v >= 0):
+            if not v >= 0:
                 raise TypeError("constants must be non-negative integers")
 
         # Partial application with args in Z. We evaluate the polynomial one variable at a time