Merge pull request symengine#441 from isuruf/floor

Define __floor__, __mod__, __divmod__ for basic

Author: isuruf

symengine/lib/symengine_wrapper.pyx

@@ -890,6 +890,16 @@ cdef class Basic(object):
         if A is None or B is None: return NotImplemented
         return c2py(symengine.div(A.thisptr, B.thisptr))
 
+    def __floordiv__(x, y):
+        return floor(x/y)
+
+    def __mod__(x, y):
+        return x - y * floor(x/y)
+
+    def __divmod__(x, y):
+        f = floor(x/y)
+        return f, x - y * f
+
     def __pow__(a, b, c):
         if c is not None:
             return powermod(a, b, c)
@@ -1830,15 +1840,6 @@ class Integer(Rational):
         else:
             return NotImplemented
 
-    def __floordiv__(x, y):
-        return quotient(x, y)
-
-    def __mod__(x, y):
-        return mod(x, y)
-
-    def __divmod__(x, y):
-        return quotient_mod(x, y)
-
     def _sympy_(Basic self):
         import sympy
         return sympy.Integer(int(self))

symengine/tests/test_arit.py

@@ -1,7 +1,7 @@
 from symengine.test_utilities import raises
 
 from symengine import (Symbol, Integer, Add, Mul, Pow, Rational, sqrt,
-    symbols, S, I, count_ops)
+    symbols, S, I, count_ops, floor)
 
 
 def test_arit1():
@@ -165,12 +165,23 @@ def test_as_numer_denom():
     assert x == Integer(-5)
     assert y == Integer(1)
 
+
+def test_floor():
+    exprs = [Symbol("x"), Symbol("y"), Integer(2), Rational(-3, 5), Integer(-3)]
+
+    for x in exprs:
+        for y in exprs:
+            assert x // y == floor(x / y)
+            assert x == y * (x // y) + x % y
+
+
 def test_as_real_imag():
     x, y = (5 + 6 * I).as_real_imag()
 
     assert x == 5
     assert y == 6
 
+
 def test_from_args():
     x = Symbol("x")
     y = Symbol("y")