Use EvalfDomain

Author: isuruf

symengine/lib/symengine.pxd

@@ -958,7 +958,11 @@ cdef extern from "<utility>" namespace "std":
     cdef PiecewiseVec std_move_PiecewiseVec "std::move" (PiecewiseVec) nogil
 
 cdef extern from "<symengine/eval.h>" namespace "SymEngine":
-    rcp_const_basic evalf(const Basic &b, unsigned long bits, bool real) nogil except +
+    enum EvalfDomain:
+        EvalfComplex "SymEngine::EvalfDomain::Complex" = 0,
+        EvalfReal "SymEngine::EvalfDomain::Real" = 1,
+        EvalfSymbolic "SymEngine::EvalfDomain::Symbolic" = 2
+    rcp_const_basic evalf(const Basic &b, unsigned long bits, EvalfDomain domain) nogil except +
 
 cdef extern from "<symengine/eval_double.h>" namespace "SymEngine":
     double eval_double(const Basic &b) nogil except +

symengine/lib/symengine_wrapper.pyx

@@ -915,7 +915,7 @@ cdef class Basic(object):
         symengine.as_real_imag(self.thisptr, symengine.outArg(_real), symengine.outArg(_imag))
         return c2py(<rcp_const_basic>_real), c2py(<rcp_const_basic>_imag)
 
-    def n(self, unsigned long prec = 53, cppbool real=False):
+    def n(self, unsigned long prec = 53, real=None):
         return evalf(self, prec, real)
 
     evalf = n
@@ -3991,9 +3991,16 @@ def Xnor(*args):
         v.push_back(symengine.rcp_static_cast_Boolean(e_.thisptr))
     return c2py(<rcp_const_basic>(symengine.logical_xnor(v)))
 
-def evalf(x, unsigned long bits=53, cppbool real=False):
+def evalf(x, unsigned long bits=53, real=None):
     cdef Basic X = sympify(x)
-    return c2py(<rcp_const_basic>(symengine.evalf(deref(X.thisptr), bits, real)))
+    cdef symengine.EvalfDomain d
+    if real is None:
+        d = symengine.EvalfSymbolic
+    elif real:
+        d = symengine.EvalfReal
+    else:
+        d = symengine.EvalfComplex
+    return c2py(<rcp_const_basic>(symengine.evalf(deref(X.thisptr), bits, d)))
 
 def eval_double(x):
     warnings.warn("eval_double is deprecated. Use evalf(..., real=True)", DeprecationWarning)

symengine/tests/test_eval.py

@@ -9,16 +9,19 @@ def test_eval_double1():
     e = sin(x)**2 + cos(x)**2
     e = e.subs(x, 7)
     assert abs(e.n(real=True) - 1) < 1e-9
+    assert abs(e.n() - 1) < 1e-9
 
 
 def test_eval_double2():
     x = Symbol("x")
     e = sin(x)**2 + sqrt(2)
-    assert abs(e.n(real=True) - x**2 - 1.414) < 1e-3
+    raises(RuntimeError, lambda: e.n(real=True))
+    assert abs(e.n() - x**2 - 1.414) < 1e-3
 
 def test_n():
     x = Symbol("x")
-    assert x.n(real=True) == x + 0.0
+    raises(RuntimeError, lambda: x.n(real=True))
+    assert x.n() == x + 0.0
 
     x = 2 + I
     raises(RuntimeError, lambda: (x.n(real=True)))