Merge pull request #263 from isuruf/evalf

wrap new evalf with symbols

Author: isuruf

symengine/lib/symengine.pxd

@@ -182,7 +182,6 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
         unsigned int hash() nogil except +
         vec_basic get_args() nogil
         int __cmp__(const Basic &o) nogil
-    ctypedef rcp_const_basic rcp_const_basic "SymEngine::RCP<const SymEngine::Basic>"
     ctypedef RCP[const Number] rcp_const_number "SymEngine::RCP<const SymEngine::Number>"
     ctypedef unordered_map[int, rcp_const_basic] umap_int_basic "SymEngine::umap_int_basic"
     ctypedef unordered_map[int, rcp_const_basic].iterator umap_int_basic_iterator "SymEngine::umap_int_basic::iterator"
@@ -958,6 +957,14 @@ cdef extern from "<utility>" namespace "std":
     cdef map_basic_basic std_move_map_basic_basic "std::move" (map_basic_basic) nogil
     cdef PiecewiseVec std_move_PiecewiseVec "std::move" (PiecewiseVec) nogil
 
+cdef extern from "<symengine/eval.h>" namespace "SymEngine":
+    cdef cppclass EvalfDomain:
+        pass
+    cdef EvalfDomain EvalfComplex "SymEngine::EvalfDomain::Complex"
+    cdef EvalfDomain EvalfReal "SymEngine::EvalfDomain::Real"
+    cdef EvalfDomain EvalfSymbolic "SymEngine::EvalfDomain::Symbolic"
+    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 +
     double complex eval_complex_double(const Basic &b) nogil except +
@@ -999,9 +1006,6 @@ IF HAVE_SYMENGINE_MPC:
 cdef extern from "<symengine/parser.h>" namespace "SymEngine":
     rcp_const_basic parse(const string &n) nogil except +
 
-cdef extern from "<symengine/codegen.h>" namespace "SymEngine":
-    string ccode(const Basic &x) nogil except +
-
 cdef extern from "<symengine/sets.h>" namespace "SymEngine":
     cdef cppclass Set(Basic):
         RCP[const Set] set_intersection(RCP[const Set] &o) nogil except +
@@ -1040,5 +1044,6 @@ cdef extern from "<symengine/solve.h>" namespace "SymEngine":
     cdef RCP[const Set] solve(rcp_const_basic &f, RCP[const Symbol] &sym) nogil except +
     cdef RCP[const Set] solve(rcp_const_basic &f, RCP[const Symbol] &sym, RCP[const Set] &domain) nogil except +
 
-cdef extern from "<symengine/latex.h>" namespace "SymEngine":
+cdef extern from "<symengine/printers.h>" namespace "SymEngine":
+    string ccode(const Basic &x) nogil except +
     string latex(const Basic &x) nogil except +

symengine/lib/symengine_wrapper.pyx

@@ -915,11 +915,8 @@ 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, prec = 53, real = False):
-        if real:
-            return eval_real(self, prec)
-        else:
-            return eval(self, prec)
+    def n(self, unsigned long prec = 53, real=None):
+        return evalf(self, prec, real)
 
     evalf = n
 
@@ -3994,13 +3991,24 @@ def Xnor(*args):
         v.push_back(symengine.rcp_static_cast_Boolean(e_.thisptr))
     return c2py(<rcp_const_basic>(symengine.logical_xnor(v)))
 
-def eval_double(x):
+def evalf(x, unsigned long bits=53, real=None):
     cdef Basic X = sympify(x)
-    return c2py(<rcp_const_basic>(symengine.real_double(symengine.eval_double(deref(X.thisptr)))))
+    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)
+    return evalf(x, 53, real=True)
 
 def eval_complex_double(x):
-    cdef Basic X = sympify(x)
-    return c2py(<rcp_const_basic>(symengine.complex_double(symengine.eval_complex_double(deref(X.thisptr)))))
+    warnings.warn("eval_complex_double is deprecated. Use evalf(..., real=False)", DeprecationWarning)
+    return evalf(x, 53, real=False)
 
 have_mpfr = False
 have_mpc = False
@@ -4010,19 +4018,15 @@ have_llvm = False
 
 IF HAVE_SYMENGINE_MPFR:
     have_mpfr = True
-    def eval_mpfr(x, long prec):
-        cdef Basic X = sympify(x)
-        cdef symengine.mpfr_class a = symengine.mpfr_class(prec)
-        symengine.eval_mpfr(a.get_mpfr_t(), deref(X.thisptr), symengine.MPFR_RNDN)
-        return c2py(<rcp_const_basic>(symengine.real_mpfr(symengine.std_move_mpfr(a))))
+    def eval_mpfr(x, unsigned long prec):
+        warnings.warn("eval_mpfr is deprecated. Use evalf(..., real=True)", DeprecationWarning)
+        return evalf(x, prec, real=True)
 
 IF HAVE_SYMENGINE_MPC:
     have_mpc = True
-    def eval_mpc(x, long prec):
-        cdef Basic X = sympify(x)
-        cdef symengine.mpc_class a = symengine.mpc_class(prec)
-        symengine.eval_mpc(a.get_mpc_t(), deref(X.thisptr), symengine.MPFR_RNDN)
-        return c2py(<rcp_const_basic>(symengine.complex_mpc(symengine.std_move_mpc(a))))
+    def eval_mpc(x, unsigned long prec):
+        warnings.warn("eval_mpc is deprecated. Use evalf(..., real=False)", DeprecationWarning)
+        return evalf(x, prec, real=True)
 
 IF HAVE_SYMENGINE_PIRANHA:
     have_piranha = True
@@ -4038,22 +4042,12 @@ def require(obj, t):
         raise TypeError("{} required. {} is of type {}".format(t, obj, type(obj)))
 
 def eval(x, long prec):
-    if prec <= 53:
-        return eval_complex_double(x)
-    else:
-        IF HAVE_SYMENGINE_MPC:
-            return eval_mpc(x, prec)
-        ELSE:
-            raise ValueError("Precision %s is only supported with MPC" % prec)
+    warnings.warn("eval is deprecated. Use evalf(..., real=False)", DeprecationWarning)
+    return evalf(x, prec, real=False)
 
 def eval_real(x, long prec):
-    if prec <= 53:
-        return eval_double(x)
-    else:
-        IF HAVE_SYMENGINE_MPFR:
-            return eval_mpfr(x, prec)
-        ELSE:
-            raise ValueError("Precision %s is only supported with MPFR" % prec)
+    warnings.warn("eval_real is deprecated. Use evalf(..., real=True)", DeprecationWarning)
+    return evalf(x, prec, real=True)
 
 def probab_prime_p(n, reps = 25):
     cdef Basic _n = sympify(n)

symengine/tests/test_eval.py

@@ -1,27 +1,27 @@
 from symengine.utilities import raises
 from symengine import (Symbol, sin, cos, Integer, Add, I, RealDouble, ComplexDouble, sqrt)
 
-from symengine.lib.symengine_wrapper import eval_double
 from unittest.case import SkipTest
 
 def test_eval_double1():
     x = Symbol("x")
     y = Symbol("y")
     e = sin(x)**2 + cos(x)**2
     e = e.subs(x, 7)
-    assert abs(eval_double(e) - 1) < 1e-9
+    assert abs(e.n(real=True) - 1) < 1e-9
+    assert abs(e.n() - 1) < 1e-9
 
 
 def test_eval_double2():
     x = Symbol("x")
-    y = Symbol("y")
-    e = sin(x)**2 + cos(x)**2
-    raises(RuntimeError, lambda: (abs(eval_double(e) - 1) < 1e-9))
-
+    e = sin(x)**2 + sqrt(2)
+    raises(RuntimeError, lambda: e.n(real=True))
+    assert abs(e.n() - x**2 - 1.414) < 1e-3
 
 def test_n():
     x = Symbol("x")
-    raises(RuntimeError, lambda: (x.n()))
+    raises(RuntimeError, lambda: x.n(real=True))
+    assert x.n() == x + 0.0
 
     x = 2 + I
     raises(RuntimeError, lambda: (x.n(real=True)))
@@ -36,25 +36,26 @@ def test_n():
 
 
 def test_n_mpfr():
+    x = sqrt(Integer(2))
     try:
         from symengine import RealMPFR
-        x = sqrt(Integer(2))
         y = RealMPFR('1.41421356237309504880169', 75)
         assert x.n(75, real=True) == y
     except ImportError:
-        x = sqrt(Integer(2))
         raises(ValueError, lambda: (x.n(75, real=True)))
+        raises(ValueError, lambda: (x.n(75)))
         raise SkipTest("No MPFR support")
 
 
 def test_n_mpc():
+    x = sqrt(Integer(2)) + 3*I
     try:
         from symengine import ComplexMPC
-        x = sqrt(Integer(2)) + 3*I
         y = ComplexMPC('1.41421356237309504880169', '3.0', 75)
         assert x.n(75) == y
     except ImportError:
-        x = sqrt(Integer(2))
+        raises(Exception, lambda: (x.n(75, real=True)))
+        raises(ValueError, lambda: (x.n(75, real=False)))
         raises(ValueError, lambda: (x.n(75)))
         raise SkipTest("No MPC support")
 

symengine_version.txt

@@ -1 +1 @@
-85c78dafe7829408f69c3bc0df7408d78ef96298
+f62f1931c9d0be28ac03938e3ec2ad33b286727d