Merge pull request #236 from bjodah/update-symengine-hash

Update symengine hash

Author: isuruf

.gitignore

@@ -29,7 +29,7 @@ build*
 MANIFEST
 *.egg-info
 dist/
-.cache/
+.*cache/
 symengine.egg-info/
 
 # Temp files

symengine/__init__.py

@@ -1,17 +1,22 @@
-from .lib.symengine_wrapper import (Symbol, S, sympify,
-        SympifyError, Add, Mul, Pow, function_symbol, I, E, pi, oo,
-        zoo, nan, have_mpfr, have_mpc, have_flint, have_piranha,
-        have_llvm, Integer, Rational, Float, Number, RealNumber,
-        RealDouble, ComplexDouble, Max, Min, DenseMatrix, Matrix,
-        ImmutableMatrix, ImmutableDenseMatrix, MutableDenseMatrix,
-        MatrixBase, Basic, DictBasic, symarray, series, diff, zeros,
-        eye, diag, ones, Derivative, Subs, add, expand, has_symbol,
-        UndefFunction, Function, FunctionSymbol as AppliedUndef,
-        have_numpy, true, false, Equality, Unequality, GreaterThan,
-        LessThan, StrictGreaterThan, StrictLessThan, Eq, Ne, Ge, Le,
-        Gt, Lt, golden_ratio as GoldenRatio, catalan as Catalan,
-        eulergamma as EulerGamma, Dummy, perfect_power, integer_nthroot,
-        isprime, sqrt_mod, Expr, cse, count_ops)
+from .lib.symengine_wrapper import (
+    have_mpfr, have_mpc, have_flint, have_piranha, have_llvm,
+    I, E, pi, oo, zoo, nan, Symbol, Dummy, S, sympify, SympifyError,
+    Integer, Rational, Float, Number, RealNumber, RealDouble, ComplexDouble,
+    add, Add, Mul, Pow, function_symbol,
+    Max, Min, DenseMatrix, Matrix,
+    ImmutableMatrix, ImmutableDenseMatrix, MutableDenseMatrix,
+    MatrixBase, Basic, DictBasic, symarray, series, diff, zeros,
+    eye, diag, ones, Derivative, Subs, expand, has_symbol,
+    UndefFunction, Function,
+    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,
+    isprime, sqrt_mod, Expr, cse, count_ops, ccode, Piecewise, Contains, Interval, FiniteSet,
+    FunctionSymbol as AppliedUndef,
+    golden_ratio as GoldenRatio,
+    catalan as Catalan,
+    eulergamma as EulerGamma
+)
 from .utilities import var, symbols
 from .functions import *
 

symengine/tests/test_functions.py

@@ -1,10 +1,10 @@
-from symengine import (Symbol, sin, cos, sqrt, Add, Mul, function_symbol, Integer, log, E, symbols, I,
-                      Rational, EulerGamma, Function)
-from symengine.lib.symengine_wrapper import (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)
+from symengine import (
+    Symbol, sin, cos, sqrt, Add, Mul, function_symbol, Integer, log, E, symbols, I,
+    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
+)
 
 import unittest
 

symengine/tests/test_lambdify.py

@@ -76,6 +76,16 @@ def test_Lambdify():
                     [3*n+3, n**2, -1/(n+2), n*(n+1)*(n+2)])
 
 
+@unittest.skipUnless(have_numpy, "Numpy not installed")
+def test_Lambdify_Piecewise():
+    x = se.symbols('x')
+    p = se.Piecewise((-x, x<0), (x*x*x, True))
+    f = se.Lambdify([x], [p])
+    arr = np.linspace(3, 7)
+    assert np.allclose(f(-arr).flat, arr, atol=1e-14, rtol=1e-15)
+    assert np.allclose(f(arr).flat, arr**3, atol=1e-14, rtol=1e-15)
+
+
 @unittest.skipUnless(have_numpy, "Numpy not installed")
 def test_Lambdify_LLVM():
     n = 7

symengine/tests/test_printing.py

@@ -1,5 +1,5 @@
+from symengine import (ccode, Symbol, sqrt, Pow, Max, sin, Integer, MutableDenseMatrix)
 from symengine.utilities import raises
-from symengine.lib.symengine_wrapper import (ccode, Symbol, sqrt, Pow, Max, sin, Integer, MutableDenseMatrix)
 from symengine.printing import CCodePrinter
 
 def test_ccode():
@@ -24,4 +24,3 @@ def test_CCodePrinter():
     assert myprinter.doprint(MutableDenseMatrix(1, 2, [x, y]), "larry") == "larry[0] = x;\nlarry[1] = y;"
     raises(TypeError, lambda: myprinter.doprint(sin(x), Integer))
     raises(RuntimeError, lambda: myprinter.doprint(MutableDenseMatrix(1, 2, [x, y])))
-    

symengine/tests/test_sympy_conv.py

@@ -752,11 +752,12 @@ def test_pynumber():
     assert b == a                  # Check equality via SymEngine
     assert a == b                  # Check equality via SymPy
 
-    a = 2 / a
-    b = 2 / b
-    assert isinstance(b, PyNumber)
-    assert b == a                  # Check equality via SymEngine
-    assert a == b                  # Check equality via SymPy
+    if sympy.__version__ != '1.2':
+        a = 2 / a
+        b = 2 / b
+        assert isinstance(b, PyNumber)
+        assert b == a                  # Check equality via SymEngine
+        assert a == b                  # Check equality via SymPy
 
     x = Symbol("x")
     b = x * sympy.FF(7)(3)

symengine_version.txt

@@ -1 +1 @@
-b3a2159b7e6950726157626069c30712427d55b2
+32d8612118a542b2fbd08feeeeac665c7c13ff65