Merge branch 'master' into python

Author: isuruf

.gitignore

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

README.md

@@ -23,12 +23,16 @@ See License section for information about wheels
 
     conda install python-symengine -c symengine -c conda-forge
 
+optionally, you may choose to install an early [developer preview](https://github.com/symengine/python-symengine-feedstock):
+
+    conda install python-symengine -c symengine/label/dev -c conda-forge
+
 ### Build from source
 
 Install prerequisites.
 
     CMake       >= 2.8.7
-    Python2     >= 2.7      or Python3 >= 3.3
+    Python2     >= 2.7      or Python3 >= 3.4
     Cython      >= 0.19.1
     SymEngine   >= 0.2.0
 

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/lib/CMakeLists.txt

@@ -32,10 +32,6 @@ install(FILES __init__.py
     ${CMAKE_CURRENT_BINARY_DIR}/config.pxi
     symengine.pxd
     symengine_wrapper.pxd
-    DESTINATION ${PY_PATH}
-    )
-
-install(FILES
     pywrapper.h
-    DESTINATION ${PYTHON_INSTALL_PATH}/symengine/lib
+    DESTINATION ${PY_PATH}
     )

symengine/lib/symengine_wrapper.pyx

@@ -63,7 +63,7 @@ cdef object c2py(rcp_const_basic o):
     elif (symengine.is_a_Symbol(deref(o))):
         if (symengine.is_a_PySymbol(deref(o))):
             return <object>(deref(symengine.rcp_static_cast_PySymbol(o)).get_py_object())
-        r = Expr.__new__(Symbol)
+        r = Symbol.__new__(Symbol)
     elif (symengine.is_a_Constant(deref(o))):
         r = S.Pi
         if (symengine.eq(deref(o), deref(r.thisptr))):
@@ -1110,7 +1110,7 @@ cdef class Expr(Basic):
     pass
 
 
-class Symbol(Expr):
+cdef class Symbol(Expr):
 
     """
     Symbol is a class to store a symbolic variable with a given name.
@@ -1155,7 +1155,7 @@ class Symbol(Expr):
         return self.__class__
 
 
-class Dummy(Symbol):
+cdef class Dummy(Symbol):
 
     def __init__(Basic self, name=None, *args, **kwargs):
         if name is None:
@@ -3164,7 +3164,7 @@ cdef class DenseMatrixBase(MatrixBase):
                     row_iter = [item[0]]
 
                 if isinstance(item[1], slice):
-                    col_iter = range(*item[1].indices(self.rows))
+                    col_iter = range(*item[1].indices(self.cols))
                 elif is_sequence(item[1]):
                     col_iter = item[1]
                 else:
@@ -3213,7 +3213,7 @@ cdef class DenseMatrixBase(MatrixBase):
                 row_iter = [key[0]]
 
             if isinstance(key[1], slice):
-                col_iter = range(*key[1].indices(self.rows))
+                col_iter = range(*key[1].indices(self.cols))
             elif is_sequence(key[1]):
                 col_iter = key[1]
             else:

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_matrices.py

@@ -73,6 +73,14 @@ def test_get_item():
     raises(IndexError, lambda: A[1:3, 3])
     raises(IndexError, lambda: A[1:3, -4])
 
+    A = zeros(3, 4)
+    assert list(A[0, :]) == [0, 0, 0, 0]
+    assert list(A[:, 0]) == [0, 0, 0]
+
+    A = zeros(4, 3)
+    assert list(A[:, 0]) == [0, 0, 0, 0]
+    assert list(A[0, :]) == [0, 0, 0]
+
 
 def test_set_item():
     A = DenseMatrix(3, 3, [1, 2, 3, 4, 5, 6, 7, 8, 9])
@@ -129,6 +137,16 @@ def test_set_item():
     B[[0, 1], [0, 2]] = -1
     assert B == DenseMatrix(3, 3, [-1, 2, -1, -1, 14, -1, 4, 5, 6])
 
+    A = zeros(3, 4)
+    B = ones(1, 4)
+    A[0, :] = B
+    assert A[0, :] == B
+
+    A = zeros(3, 4)
+    B = ones(3, 1)
+    A[:, 0] = B
+    assert A[:, 0] == B
+
 
 def test_set():
     i7 = Integer(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_symbol.py

@@ -8,6 +8,9 @@ def test_symbol():
     assert str(x) == "x"
     assert str(x) != "y"
     assert repr(x) == str(x)
+    # Verify the successful use of slots.
+    assert not hasattr(x, "__dict__")
+    assert not hasattr(x, "__weakref__")
 
 
 def test_symbols():
@@ -148,6 +151,7 @@ def test_has_symbol():
     assert not has_symbol(c, a)
     assert has_symbol(a+b, b)
 
+
 def test_dummy():
     x1 = Symbol('x')
     x2 = Symbol('x')
@@ -159,3 +163,6 @@ def test_dummy():
     assert xdummy1 != xdummy2
     assert Dummy() != Dummy()
     assert Dummy('x') != Dummy('x')
+    # Verify the successful use of slots.
+    assert not hasattr(xdummy1, "__dict__")
+    assert not hasattr(xdummy1, "__weakref__")