Merge pull request #187 from isuruf/expand

expand(deep=False)

Author: isuruf

symengine/lib/symengine.pxd

@@ -310,7 +310,7 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     bool is_a_Not "SymEngine::is_a<SymEngine::Not>"(const Basic &b) nogil
     bool is_a_Or "SymEngine::is_a<SymEngine::Or>"(const Basic &b) nogil
     bool is_a_Xor "SymEngine::is_a<SymEngine::Xor>"(const Basic &b) nogil
-    RCP[const Basic] expand(RCP[const Basic] &o) nogil except +
+    RCP[const Basic] expand(RCP[const Basic] &o, bool deep) nogil except +
     void as_numer_denom(RCP[const Basic] &x, const Ptr[RCP[Basic]] &numer, const Ptr[RCP[Basic]] &denom) nogil
 
 cdef extern from "<symengine/subs.h>" namespace "SymEngine":

symengine/lib/symengine_wrapper.pyx

@@ -844,8 +844,8 @@ cdef class Basic(object):
         elif (op == 5):
             return c2py(<RCP[const symengine.Basic]>(symengine.Ge(A.thisptr, B.thisptr)))
 
-    def expand(Basic self not None):
-        return c2py(symengine.expand(self.thisptr))
+    def expand(Basic self not None, cppbool deep=True):
+        return c2py(symengine.expand(self.thisptr, deep))
 
     def diff(Basic self not None, x = None):
         if x is None:
@@ -3560,7 +3560,7 @@ cdef class DenseMatrixBase(MatrixBase):
         return self._applyfunc(lambda x : x.simplify(*args, **kwargs))
 
     def expand(self, *args, **kwargs):
-        return self.applyfunc(lambda x : x.expand())
+        return self.applyfunc(lambda x : x.expand(*args, **kwargs))
 
 
 def div_matrices(a, b):
@@ -3726,8 +3726,8 @@ def diff(ex, *x):
         ex = ex.diff(i)
     return ex
 
-def expand(x):
-    return sympify(x).expand()
+def expand(x, deep=True):
+    return sympify(x).expand(deep)
 
 expand_mul = expand
 

symengine/tests/test_arit.py

@@ -113,9 +113,13 @@ def test_arit9():
 
 
 def test_expand2():
+    x = Symbol("x")
     y = Symbol("y")
     z = Symbol("z")
     assert ((1/(y*z) - y*z)*y*z).expand() == 1-(y*z)**2
+    assert (2*(x + 2*(y + z))).expand(deep=False) == 2*x + 4*(y+z)
+    ex = x + 2*(y + z)
+    assert ex.expand(deep=False) == ex
 
 
 def test_expand3():

symengine_version.txt

@@ -1 +1 @@
-978dfd1656d5dbc722f5dc448bbe96e97b2d7be9
+a2a839b5d8c4eab1560ed7ed56c805e1160344e3