Merge branch 'master' of github.com:symengine/symengine.py into 0.6.x

Author: isuruf

symengine/__init__.py

@@ -7,7 +7,7 @@
     ImmutableMatrix, ImmutableDenseMatrix, MutableDenseMatrix,
     MatrixBase, Basic, DictBasic, symarray, series, diff, zeros,
     eye, diag, ones, Derivative, Subs, expand, has_symbol,
-    UndefFunction, Function, latex,
+    UndefFunction, Function, UnevaluatedExpr, latex,
     have_numpy, true, false, Equality, Unequality, GreaterThan,
     LessThan, StrictGreaterThan, StrictLessThan, Eq, Ne, Ge, Le,
     Gt, Lt, And, Or, Not, Nand, Nor, Xor, Xnor, perfect_power, integer_nthroot,

symengine/lib/symengine.pxd

@@ -307,7 +307,7 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     bool is_a_Complement "SymEngine::is_a<SymEngine::Complement>"(const Basic &b) nogil
     bool is_a_ConditionSet "SymEngine::is_a<SymEngine::ConditionSet>"(const Basic &b) nogil
     bool is_a_ImageSet "SymEngine::is_a<SymEngine::ImageSet>"(const Basic &b) nogil
-
+    bool is_a_UnevaluatedExpr "SymEngine::is_a<SymEngine::UnevaluatedExpr>"(const Basic &b) nogil
     bool is_a_Piecewise "SymEngine::is_a<SymEngine::Piecewise>"(const Basic &b) nogil
     bool is_a_Contains "SymEngine::is_a<SymEngine::Contains>"(const Basic &b) nogil
     bool is_a_And "SymEngine::is_a<SymEngine::And>"(const Basic &b) nogil
@@ -535,6 +535,7 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
     cdef rcp_const_basic conjugate(rcp_const_basic &x) nogil except+
     cdef rcp_const_basic log(rcp_const_basic &x) nogil except+
     cdef rcp_const_basic log(rcp_const_basic &x, rcp_const_basic &y) nogil except+
+    cdef rcp_const_basic unevaluated_expr(rcp_const_basic &x) nogil except+
 
     cdef cppclass Function(Basic):
         pass

symengine/lib/symengine_wrapper.pyx

@@ -245,6 +245,8 @@ cdef object c2py(rcp_const_basic o):
         r = Boolean.__new__(Or)
     elif (symengine.is_a_Xor(deref(o))):
         r = Boolean.__new__(Xor)
+    elif (symengine.is_a_UnevaluatedExpr(deref(o))):
+        r = Function.__new__(UnevaluatedExpr)
     else:
         raise Exception("Unsupported SymEngine class.")
     r.thisptr = o
@@ -451,6 +453,8 @@ def sympy2symengine(a, raise_error=False):
         return imageset(*(a.args))
     elif isinstance(a, sympy.Function):
         return PyFunction(a, a.args, a.func, sympy_module)
+    elif isinstance(a, sympy.UnevaluatedExpr):
+        return UnevaluatedExpr(a.args[0])
     elif isinstance(a, sympy.MatrixBase):
         row, col = a.shape
         v = []
@@ -2571,6 +2575,24 @@ add = Add
 mul = Mul
 
 
+class UnevaluatedExpr(OneArgFunction):
+    def __new__(cls, x):
+        cdef Basic X = sympify(x)
+        return c2py(symengine.unevaluated_expr(X.thisptr))
+
+    @property
+    def is_number(self):
+        return self.args[0].is_number
+
+    @property
+    def is_integer(self):
+        return self.args[0].is_integer
+
+    @property
+    def is_finite(self):
+        return self.args[0].is_finite
+
+
 class Abs(OneArgFunction):
 
     @property

symengine/tests/test_functions.py

@@ -3,7 +3,7 @@
     Rational, EulerGamma, Function, Subs, Derivative, LambertW, zeta, dirichlet_eta,
     zoo, pi, KroneckerDelta, LeviCivita, erf, erfc, oo, lowergamma, uppergamma, exp,
     loggamma, beta, polygamma, digamma, trigamma, sign, floor, ceiling, conjugate,
-    nan, Float
+    nan, Float, UnevaluatedExpr
 )
 
 import unittest
@@ -386,3 +386,17 @@ def test_ceiling():
 def test_conjugate():
     assert conjugate(pi) == pi
     assert conjugate(I) == -I
+
+
+def test_unevaluated_expr():
+    x = Symbol("x")
+    t = UnevaluatedExpr(x)
+    assert x + t != 2 * x
+    assert not t.is_number
+    assert not t.is_integer
+    assert not t.is_finite
+
+    t = UnevaluatedExpr(1)
+    assert t.is_number
+    assert t.is_integer
+    assert t.is_finite

symengine/tests/test_sympy_conv.py

@@ -3,7 +3,7 @@
         exp, gamma, have_mpfr, have_mpc, DenseMatrix, sin, cos, tan, cot,
         csc, sec, asin, acos, atan, acot, acsc, asec, sinh, cosh, tanh, coth,
         asinh, acosh, atanh, acoth, Add, Mul, Pow, diff, GoldenRatio,
-        Catalan, EulerGamma)
+        Catalan, EulerGamma, UnevaluatedExpr)
 from symengine.lib.symengine_wrapper import (Subs, Derivative, RealMPFR,
         ComplexMPC, PyNumber, Function, LambertW, zeta, dirichlet_eta,
         KroneckerDelta, LeviCivita, erf, erfc, lowergamma, uppergamma,
@@ -651,6 +651,15 @@ def test_conjugate():
     assert e2._sympy_() == e1
 
 
+@unittest.skipIf(not have_sympy, "SymPy not installed")
+def test_unevaluated_expr():
+    x = Symbol("x")
+    e1 = sympy.UnevaluatedExpr(sympy.Symbol("x"))
+    e2 = UnevaluatedExpr(x)
+    assert sympify(e1) == e2
+    assert e2._sympy_() == e1
+
+
 @unittest.skipIf(not have_sympy, "SymPy not installed")
 def test_logic():
     x = true

symengine_version.txt

@@ -1 +1 @@
-v0.6.0
+fbd501264a86b7452ec35bb0370fbabc6d83b5c6