cdef'd operands POC

Author: Jake Moss

src/flint/flint_base/flint_base.pxd

@@ -14,7 +14,30 @@ cdef class flint_mpoly_context(flint_elem):
     cdef const char ** c_names
 
 cdef class flint_mpoly(flint_elem):
-    pass
+    cdef _add_scalar_(self, other)
+    cdef _sub_scalar_(self, other)
+    cdef _mul_scalar_(self, other)
+    cdef _pow_(self, other)
+
+    cdef _add_mpoly_(self, other)
+    cdef _sub_mpoly_(self, other)
+    cdef _mul_mpoly_(self, other)
+
+    cdef _divmod_mpoly_(self, other)
+    cdef _floordiv_mpoly_(self, other)
+    cdef _truediv_mpoly_(self, other)
+    cdef _mod_mpoly_(self, other)
+
+    cdef _rtruediv_mpoly_(self, other)
+
+    cdef _iadd_scalar_(self, other)
+    cdef _isub_scalar_(self, other)
+    cdef _imul_scalar_(self, other)
+
+    cdef _iadd_mpoly_(self, other)
+    cdef _isub_mpoly_(self, other)
+    cdef _imul_mpoly_(self, other)
+
 
 cdef class flint_mat(flint_elem):
     pass

src/flint/flint_base/flint_base.pyx

@@ -405,52 +405,58 @@ cdef class flint_mpoly(flint_elem):
         if not other:
             raise ZeroDivisionError("nmod_mpoly division by zero")
 
-    def _add_scalar_(self, other):
+    cdef _add_scalar_(self, other):
         return NotImplemented
 
-    def _add_mpoly_(self, other):
+    cdef _sub_scalar_(self, other):
         return NotImplemented
 
-    def _iadd_scalar_(self, other):
+    cdef _mul_scalar_(self, other):
         return NotImplemented
 
-    def _iadd_mpoly_(self, other):
+    cdef _pow_(self, other):
         return NotImplemented
 
-    def _sub_scalar_(self, other):
+    cdef _add_mpoly_(self, other):
         return NotImplemented
 
-    def _sub_mpoly_(self, other):
+    cdef _sub_mpoly_(self, other):
         return NotImplemented
 
-    def _isub_scalar_(self, other):
+    cdef _mul_mpoly_(self, other):
         return NotImplemented
 
-    def _isub_mpoly_(self, other):
+    cdef _divmod_mpoly_(self, other):
         return NotImplemented
 
-    def _mul_scalar_(self, other):
+    cdef _floordiv_mpoly_(self, other):
         return NotImplemented
 
-    def _imul_mpoly_(self, other):
+    cdef _truediv_mpoly_(self, other):
         return NotImplemented
 
-    def _imul_scalar_(self, other):
+    cdef _rtruediv_mpoly_(self, other):
         return NotImplemented
 
-    def _mul_mpoly_(self, other):
+    cdef _mod_mpoly_(self, other):
         return NotImplemented
 
-    def _pow_(self, other):
+    cdef _iadd_scalar_(self, other):
         return NotImplemented
 
-    def _divmod_mpoly_(self, other):
+    cdef _isub_scalar_(self, other):
         return NotImplemented
 
-    def _floordiv_mpoly_(self, other):
+    cdef _imul_scalar_(self, other):
         return NotImplemented
 
-    def _truediv_mpoly_(self, other):
+    cdef _iadd_mpoly_(self, other):
+        return NotImplemented
+
+    cdef _isub_mpoly_(self, other):
+        return NotImplemented
+
+    cdef _imul_mpoly_(self, other):
         return NotImplemented
 
     def __add__(self, other):
@@ -628,7 +634,8 @@ cdef class flint_mpoly(flint_elem):
 
         other = self.context().scalar_as_mpoly(other)
         other._division_check(self)
-        return other._truediv_mpoly_(self)
+        # return other._truediv_mpoly_(self)
+        return self._rtruediv_mpoly_(other)
 
     def __floordiv__(self, other):
         if typecheck(other, type(self)):

src/flint/types/fmpz_mpoly.pyx

@@ -326,77 +326,112 @@ cdef class fmpz_mpoly(flint_mpoly):
         fmpz_mpoly_neg(res.val, (<fmpz_mpoly>self).val, res.ctx.val)
         return res
 
-    def _add_scalar_(self, other: fmpz):
-        cdef fmpz_mpoly res
+    cdef _add_scalar_(self, arg):
+        cdef:
+            fmpz_mpoly res
+            fmpz other = <fmpz>arg
         res = create_fmpz_mpoly(self.ctx)
         fmpz_mpoly_add_fmpz(res.val, self.val, other.val, self.ctx.val)
         return res
 
-    def _add_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly res
+    cdef _sub_scalar_(self, arg):
+        cdef:
+            fmpz_mpoly res
+            fmpz other = <fmpz>arg
         res = create_fmpz_mpoly(self.ctx)
-        fmpz_mpoly_add(res.val, self.val, other.val, res.ctx.val)
+        fmpz_mpoly_sub_fmpz(res.val, self.val, other.val, self.ctx.val)
         return res
 
-    def _sub_scalar_(self, other: fmpz):
-        cdef fmpz_mpoly res
+    cdef _mul_scalar_(self, arg):
+        cdef:
+            fmpz_mpoly res
+            fmpz other = <fmpz>arg
         res = create_fmpz_mpoly(self.ctx)
-        fmpz_mpoly_sub_fmpz(res.val, self.val, other.val, self.ctx.val)
+        fmpz_mpoly_scalar_mul_fmpz(res.val, self.val, other.val, self.ctx.val)
         return res
 
-    def _sub_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly res
+    cdef _pow_(self, arg):
+        cdef:
+            fmpz_mpoly res
+            fmpz other = <fmpz>arg
         res = create_fmpz_mpoly(self.ctx)
-        fmpz_mpoly_sub(res.val, self.val, other.val, res.ctx.val)
+        if fmpz_mpoly_pow_fmpz(res.val, self.val, other.val, res.ctx.val) == 0:
+            raise ValueError("unreasonably large polynomial")  # pragma: no cover
         return res
 
-    def _mul_scalar_(self, other: fmpz):
-        cdef fmpz_mpoly res
+    cdef _add_mpoly_(self, arg):
+        cdef fmpz_mpoly res, other = <fmpz_mpoly>arg
         res = create_fmpz_mpoly(self.ctx)
-        fmpz_mpoly_scalar_mul_fmpz(res.val, self.val, other.val, self.ctx.val)
+        fmpz_mpoly_add(res.val, self.val, other.val, res.ctx.val)
         return res
 
-    def _mul_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly res
+    cdef _sub_mpoly_(self, arg):
+        cdef fmpz_mpoly res, other = <fmpz_mpoly>arg
         res = create_fmpz_mpoly(self.ctx)
-        fmpz_mpoly_mul(res.val, self.val, other.val, res.ctx.val)
+        fmpz_mpoly_sub(res.val, self.val, other.val, res.ctx.val)
         return res
 
-    def _pow_(self, other: fmpz):
-        cdef fmpz_mpoly res
+    cdef _mul_mpoly_(self, arg):
+        cdef fmpz_mpoly res, other = <fmpz_mpoly>arg
         res = create_fmpz_mpoly(self.ctx)
-        if fmpz_mpoly_pow_fmpz(res.val, self.val, other.val, res.ctx.val) == 0:
-            raise ValueError("unreasonably large polynomial")  # pragma: no cover
+        fmpz_mpoly_mul(res.val, self.val, other.val, res.ctx.val)
         return res
 
-    def _divmod_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly quotient, remainder
+    cdef _divmod_mpoly_(self, arg):
+        cdef fmpz_mpoly quotient, remainder, other = <fmpz_mpoly>arg
         quotient = create_fmpz_mpoly(self.ctx)
         remainder = create_fmpz_mpoly(self.ctx)
         fmpz_mpoly_divrem(quotient.val, remainder.val, self.val, other.val, self.ctx.val)
         return (quotient, remainder)
 
-    def _floordiv_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly quotient
+    cdef _floordiv_mpoly_(self, arg):
+        cdef fmpz_mpoly quotient, other = <fmpz_mpoly>arg
         quotient = create_fmpz_mpoly(self.ctx)
         fmpz_mpoly_div(quotient.val, self.val, other.val, self.ctx.val)
         return quotient
 
-    def _truediv_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly quotient
+    cdef _truediv_mpoly_(self, arg):
+        cdef fmpz_mpoly quotient, other = <fmpz_mpoly>arg
         quotient = create_fmpz_mpoly(self.ctx)
         if fmpz_mpoly_divides(quotient.val, self.val, other.val, self.ctx.val):
             return quotient
         else:
             raise DomainError("fmpz_mpoly division is not exact")
 
-    def _mod_mpoly_(self, other: fmpz_mpoly):
-        cdef fmpz_mpoly quotient, remainder
+    cdef _rtruediv_mpoly_(self, arg):
+        return (<fmpz_mpoly>arg)._truediv_mpoly_(self)
+
+    cdef _mod_mpoly_(self, arg):
+        cdef fmpz_mpoly quotient, remainder, other = <fmpz_mpoly>arg
         quotient = create_fmpz_mpoly(self.ctx)
         remainder = create_fmpz_mpoly(self.ctx)
         fmpz_mpoly_divrem(quotient.val, remainder.val, self.val, other.val, self.ctx.val)
         return remainder
 
+    cdef _iadd_scalar_(self, arg):
+        cdef fmpz other = <fmpz>arg
+        fmpz_mpoly_add_fmpz(self.val, self.val, other.val, self.ctx.val)
+
+    cdef _isub_scalar_(self, arg):
+        cdef fmpz other = <fmpz>arg
+        fmpz_mpoly_sub_fmpz(self.val, self.val, other.val, self.ctx.val)
+
+    cdef _imul_scalar_(self, arg):
+        cdef fmpz other = <fmpz>arg
+        fmpz_mpoly_scalar_mul_fmpz(self.val, self.val, other.val, self.ctx.val)
+
+    cdef _iadd_mpoly_(self, arg):
+        cdef fmpz_mpoly other = <fmpz_mpoly>arg
+        fmpz_mpoly_add(self.val, self.val, other.val, self.ctx.val)
+
+    cdef _isub_mpoly_(self, arg):
+        cdef fmpz_mpoly other = <fmpz_mpoly>arg
+        fmpz_mpoly_sub(self.val, self.val, other.val, self.ctx.val)
+
+    cdef _imul_mpoly_(self, arg):
+        cdef fmpz_mpoly other = <fmpz_mpoly>arg
+        fmpz_mpoly_mul(self.val, self.val, other.val, self.ctx.val)
+
     def __call__(self, *args) -> fmpz:
         cdef:
             fmpz_vec V
@@ -412,24 +447,6 @@ cdef class fmpz_mpoly(flint_mpoly):
             raise ValueError("unreasonably large polynomial")  # pragma: no cover
         return vres
 
-    def _iadd_scalar_(self, other: fmpz):
-        fmpz_mpoly_add_fmpz(self.val, self.val, other.val, self.ctx.val)
-
-    def _iadd_mpoly_(self, other: fmpz_mpoly):
-        fmpz_mpoly_add(self.val, self.val, other.val, self.ctx.val)
-
-    def _isub_scalar_(self, other: fmpz):
-        fmpz_mpoly_sub_fmpz(self.val, self.val, other.val, self.ctx.val)
-
-    def _isub_mpoly_(self, other: fmpz_mpoly):
-        fmpz_mpoly_sub(self.val, self.val, other.val, self.ctx.val)
-
-    def _imul_scalar_(self, other: fmpz):
-        fmpz_mpoly_scalar_mul_fmpz(self.val, self.val, other.val, self.ctx.val)
-
-    def _imul_mpoly_(self, other: fmpz_mpoly):
-        fmpz_mpoly_mul(self.val, self.val, other.val, self.ctx.val)
-
     def monoms(self):
         """
         Return the exponent vectors of each term as a tuple of fmpz.