Support comparisons with more literals

Author: Jake-Moss

src/flint/test/test_all.py

@@ -2685,13 +2685,13 @@ def _all_mpolys():
         (
             flint.nmod_mpoly,
             lambda *args, **kwargs: flint.nmod_mpoly_ctx.get_context(*args, **kwargs, modulus=101),
-            int,
+            lambda x: flint.nmod(x, 101),
             True,
         ),
         (
             flint.nmod_mpoly,
             lambda *args, **kwargs: flint.nmod_mpoly_ctx.get_context(*args, **kwargs, modulus=100),
-            int,
+            lambda x: flint.nmod(x, 100),
             False,
         ),
     ]
@@ -2767,10 +2767,15 @@ def quick_poly():
         assert (P(1, ctx=ctx) == P(2, ctx=ctx)) is False
         assert (P(1, ctx=ctx) != P(2, ctx=ctx)) is True
 
-        assert (P(1, ctx=ctx) == 1) is False
-        assert (P(1, ctx=ctx) != 1) is True
-        assert (1 == P(1, ctx=ctx)) is False
-        assert (1 != P(1, ctx=ctx)) is True
+        assert (P(1, ctx=ctx) == 1) is True
+        assert (P(1, ctx=ctx) != 1) is False
+        assert (1 == P(1, ctx=ctx)) is True
+        assert (1 != P(1, ctx=ctx)) is False
+
+        assert (P(1, ctx=ctx) == S(1)) is True
+        assert (P(1, ctx=ctx) != S(1)) is False
+        assert (S(1) == P(1, ctx=ctx)) is True
+        assert (S(1) != P(1, ctx=ctx)) is False
 
         assert (P(1, ctx=ctx) == P(1, ctx=ctx1)) is False
         assert (P(1, ctx=ctx) != P(1, ctx=ctx1)) is True
@@ -2926,7 +2931,7 @@ def quick_poly():
                 else {k: ctx.modulus() + v for k, v in {(0, 0): -4, (0, 1): -4, (1, 0): -4, (2, 2): -4}.items()}
         )
 
-        for T in [int, S, lambda x: P(x, ctx=ctx)]:
+        for T in [int, S, int, lambda x: P(x, ctx=ctx)]:
             p = quick_poly()
             p -= T(1)
             q = quick_poly()
@@ -2955,7 +2960,7 @@ def quick_poly():
                 (0, 1): 6
             })
 
-        for T in [int, S, lambda x: P(x, ctx=ctx)]:
+        for T in [int, S, int, lambda x: P(x, ctx=ctx)]:
             p = quick_poly()
             p *= T(2)
             q = quick_poly()

src/flint/types/fmpq_mpoly.pyx

@@ -28,6 +28,8 @@ from flint.flintlib.fmpq_mpoly cimport (
     fmpq_mpoly_divides,
     fmpq_mpoly_divrem,
     fmpq_mpoly_equal,
+    fmpq_mpoly_equal_fmpq,
+    fmpq_mpoly_equal_fmpz,
     fmpq_mpoly_evaluate_all_fmpq,
     fmpq_mpoly_evaluate_one_fmpq,
     fmpq_mpoly_gcd,
@@ -256,11 +258,18 @@ cdef class fmpq_mpoly(flint_mpoly):
             return op == Py_NE
         elif typecheck(self, fmpq_mpoly) and typecheck(other, fmpq_mpoly):
             if (<fmpq_mpoly>self).ctx is (<fmpq_mpoly>other).ctx:
-                return (op == Py_NE) ^ bool(
-                    fmpq_mpoly_equal((<fmpq_mpoly>self).val, (<fmpq_mpoly>other).val, (<fmpq_mpoly>self).ctx.val)
-                )
+                return (op == Py_NE) ^ <bint>fmpq_mpoly_equal(self.val, (<fmpq_mpoly>other).val, self.ctx.val)
             else:
                 return op == Py_NE
+        elif typecheck(other, fmpq):
+            return (op == Py_NE) ^ <bint>fmpq_mpoly_equal_fmpq(self.val, (<fmpq>other).val, self.ctx.val)
+        elif typecheck(other, fmpz):
+            return (op == Py_NE) ^ <bint>fmpq_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
+        elif isinstance(other, int):
+            other = any_as_fmpz(other)
+            if other is NotImplemented:
+                return NotImplemented
+            return (op == Py_NE) ^ <bint>fmpq_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
         else:
             return NotImplemented
 

src/flint/types/fmpz_mod_mpoly.pyx

@@ -26,6 +26,7 @@ from flint.flintlib.fmpz_mod_mpoly cimport (
     fmpz_mod_mpoly_divides,
     fmpz_mod_mpoly_divrem,
     fmpz_mod_mpoly_equal,
+    fmpz_mod_mpoly_equal_fmpz,
     fmpz_mod_mpoly_evaluate_all_fmpz,
     fmpz_mod_mpoly_evaluate_one_fmpz,
     fmpz_mod_mpoly_gcd,
@@ -308,6 +309,13 @@ cdef class fmpz_mod_mpoly(flint_mpoly):
                 )
             else:
                 return op == Py_NE
+        elif typecheck(other, fmpz):
+            return (op == Py_NE) ^ <bint>fmpz_mod_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
+        elif isinstance(other, int):
+            other = any_as_fmpz(other)
+            if other is NotImplemented:
+                return NotImplemented
+            return (op == Py_NE) ^ <bint>fmpz_mod_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
         else:
             return NotImplemented
 

src/flint/types/fmpz_mpoly.pyx

@@ -24,13 +24,13 @@ from flint.flintlib.fmpz_mpoly cimport (
     fmpz_mpoly_divides,
     fmpz_mpoly_divrem,
     fmpz_mpoly_equal,
+    fmpz_mpoly_equal_fmpz,
     fmpz_mpoly_evaluate_all_fmpz,
     fmpz_mpoly_evaluate_one_fmpz,
     fmpz_mpoly_gcd,
     fmpz_mpoly_gen,
     fmpz_mpoly_get_coeff_fmpz_fmpz,
     fmpz_mpoly_get_str_pretty,
-    fmpz_mpoly_get_term,
     fmpz_mpoly_get_term_coeff_fmpz,
     fmpz_mpoly_get_term_exp_fmpz,
     fmpz_mpoly_integral,
@@ -234,13 +234,18 @@ cdef class fmpz_mpoly(flint_mpoly):
             return NotImplemented
         elif other is None:
             return op == Py_NE
-        elif typecheck(self, fmpz_mpoly) and typecheck(other, fmpz_mpoly):
+        elif typecheck(other, fmpz_mpoly):
             if (<fmpz_mpoly>self).ctx is (<fmpz_mpoly>other).ctx:
-                return (op == Py_NE) ^ bool(
-                    fmpz_mpoly_equal((<fmpz_mpoly>self).val, (<fmpz_mpoly>other).val, (<fmpz_mpoly>self).ctx.val)
-                )
+                return (op == Py_NE) ^ <bint>fmpz_mpoly_equal(self.val, (<fmpz_mpoly>other).val, self.ctx.val)
             else:
                 return op == Py_NE
+        elif typecheck(other, fmpz):
+            return (op == Py_NE) ^ <bint>fmpz_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
+        elif isinstance(other, int):
+            other = any_as_fmpz(other)
+            if other is NotImplemented:
+                return NotImplemented
+            return (op == Py_NE) ^ <bint>fmpz_mpoly_equal_fmpz(self.val, (<fmpz>other).val, self.ctx.val)
         else:
             return NotImplemented
 

src/flint/types/nmod_mpoly.pyx

@@ -12,6 +12,8 @@ from flint.utils.flint_exceptions import DomainError, IncompatibleContextError
 from flint.types.fmpz cimport any_as_fmpz, fmpz
 from flint.types.fmpz_vec cimport fmpz_vec
 
+from flint.types.nmod cimport nmod
+
 from flint.flintlib.fmpz cimport fmpz_set
 from flint.flintlib.nmod_mpoly cimport (
     nmod_mpoly_add,
@@ -26,6 +28,7 @@ from flint.flintlib.nmod_mpoly cimport (
     nmod_mpoly_divides,
     nmod_mpoly_divrem,
     nmod_mpoly_equal,
+    nmod_mpoly_equal_ui,
     nmod_mpoly_evaluate_all_ui,
     nmod_mpoly_evaluate_one_ui,
     nmod_mpoly_gcd,
@@ -283,11 +286,15 @@ cdef class nmod_mpoly(flint_mpoly):
             return op == Py_NE
         elif typecheck(self, nmod_mpoly) and typecheck(other, nmod_mpoly):
             if (<nmod_mpoly>self).ctx is (<nmod_mpoly>other).ctx:
-                return (op == Py_NE) ^ bool(
-                    nmod_mpoly_equal((<nmod_mpoly>self).val, (<nmod_mpoly>other).val, (<nmod_mpoly>self).ctx.val)
-                )
+                return (op == Py_NE) ^ <bint>nmod_mpoly_equal(self.val, (<nmod_mpoly>other).val, self.ctx.val)
             else:
                 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()}")
+            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)
         else:
             return NotImplemented