Merge branch 'master' into heterogeneous-Lambdify

Author: bjodah

.travis.yml

@@ -11,9 +11,6 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - libgmp-dev
-    - libmpfr-dev
-    - libmpc-dev
     - binutils-dev
     - g++-4.7
 
@@ -55,34 +52,20 @@ matrix:
         apt:
           sources:
           - ubuntu-toolchain-r-test
-          - boost-latest
-          - george-edison55-precise-backports
           packages:
-          - libgmp-dev
-          - libmpfr-dev
           - binutils-dev
-          - libboost-serialization1.55-dev
-          - libboost-iostreams1.55-dev
           - g++-4.8
-          - cmake
-          - cmake-data
     - env: BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.5" WITH_LLVM="yes"
       compiler: clang
       os: linux
       addons:
         apt:
           sources:
           - ubuntu-toolchain-r-test
-          - llvm-toolchain-precise-3.8
-          - george-edison55-precise-backports
           packages:
           - clang
           - libstdc++-4.8-dev
-          - libgmp-dev
           - binutils-dev
-          - llvm-3.8-dev
-          - cmake
-          - cmake-data
     - env: BUILD_TYPE="Release" PYTHON_VERSION="2.7"
       compiler: clang
       os: linux
@@ -109,22 +92,25 @@ matrix:
 install:
   - export PYTHON_SOURCE_DIR=`pwd`
   - export TEST_CPP="no"
+  - export MAKEFLAGS="-j2"
 
   - git clone https://github.com/symengine/symengine symengine-cpp
   - cd symengine-cpp
   - export SOURCE_DIR=`pwd`
   - git checkout `cat ../symengine_version.txt`
-
-  # Setup travis for C++ library
-  - if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
+  - cd ..
 
   # Setup travis for Python wrappers
-  - cd $PYTHON_SOURCE_DIR
   - source bin/install_travis.sh
 
+  # Setup travis for C++ library
+  - cd $SOURCE_DIR
+  - if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
+
   # Build C++ library
-  - cd symengine-cpp
+  - cd $SOURCE_DIR
   - bin/test_travis.sh
+  - unset MAKEFLAGS
 
 script:
   # Build Python wrappers and test

bin/install_travis.sh

@@ -1,23 +1,11 @@
 #!/usr/bin/env bash
 
 if [[ "${WITH_SAGE}" != "yes" ]]; then
-    if [[ "${TRAVIS_OS_NAME}" != "osx" ]]; then
-        wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-        wget https://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -O miniconda.sh;
-    fi
-    bash miniconda.sh -b -p $our_install_dir/miniconda;
-    export PATH="$our_install_dir/miniconda/bin:$PATH";
-    hash -r;
-    conda config --set always_yes yes --set changeps1 no;
-    conda update -q conda;
-    conda info -a;
-    CONDA_PKGS="pip cython sympy nose pytest"
+    # symengine's bin/install_travis.sh will install miniconda
+    conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
     if [[ "${WITH_NUMPY}" == "yes" ]]; then
-        CONDA_PKGS="${CONDA_PKGS} numpy";
+        conda_pkgs="${conda_pkgs} numpy";
     fi
-    conda create -q -n test-environment python="${PYTHON_VERSION}" ${CONDA_PKGS};
-    source activate test-environment;
 else
     wget -O- https://dl.dropboxusercontent.com/u/46807346/sage-6.9-x86_64-Linux-Ubuntu_12.04_64_bit.tar.gz | tar xz
     SAGE_ROOT=`pwd`/sage-6.9-x86_64-Linux

symengine/lib/pywrapper.cpp

@@ -63,6 +63,10 @@ bool PyNumber::is_negative() const {
 bool PyNumber::is_positive() const {
     return PyObject_RichCompareBool(pyobject_, pymodule_->get_zero(), Py_GT) == 1;
 }
+//! \return true if complex
+bool PyNumber::is_complex() const {
+    return false;
+}
 
 //! Addition
 RCP<const Number> PyNumber::add(const Number &other) const {

symengine/lib/symengine.pxd

@@ -256,6 +256,7 @@ cdef extern from "<symengine/basic.h>" namespace "SymEngine":
     bool is_a_ComplexMPC "SymEngine::is_a<SymEngine::ComplexMPC>"(const Basic &b) nogil
     bool is_a_Log "SymEngine::is_a<SymEngine::Log>"(const Basic &b) nogil
     bool is_a_PyNumber "SymEngine::is_a<SymEngine::PyNumber>"(const Basic &b) nogil
+    bool is_a_ATan2 "SymEngine::is_a<SymEngine::ATan2>"(const Basic &b) nogil
 
     RCP[const Basic] expand(RCP[const Basic] &o) nogil except +
 
@@ -273,6 +274,10 @@ cdef extern from "<symengine/symbol.h>" namespace "SymEngine":
 
 cdef extern from "<symengine/number.h>" namespace "SymEngine":
     cdef cppclass Number(Basic):
+        bool is_positive() nogil
+        bool is_negative() nogil
+        bool is_zero() nogil
+        bool is_complex() nogil
         pass
     cdef cppclass NumberWrapper(Basic):
         pass
@@ -413,6 +418,7 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
     cdef RCP[const Basic] function_symbol(string name, const vec_basic &arg) nogil except+
     cdef RCP[const Basic] abs(RCP[const Basic] &arg) nogil except+
     cdef RCP[const Basic] gamma(RCP[const Basic] &arg) nogil except+
+    cdef RCP[const Basic] atan2(RCP[const Basic] &num, RCP[const Basic] &den) nogil except+
 
     cdef cppclass Function(Basic):
         pass
@@ -508,6 +514,9 @@ cdef extern from "<symengine/functions.h>" namespace "SymEngine":
     cdef cppclass Gamma(Function):
         pass
 
+    cdef cppclass ATan2(Function):
+        pass
+
 IF HAVE_SYMENGINE_MPFR:
     cdef extern from "mpfr.h":
         ctypedef struct __mpfr_struct:

symengine/lib/symengine/pywrapper.h

@@ -80,6 +80,8 @@ class PyNumber : public NumberWrapper {
     virtual bool is_negative() const;
     //! \return true if positive
     virtual bool is_positive() const;
+    //! \return true if complex
+    virtual bool is_complex() const;
     //! return true if the number is an exact representation
     //  false if the number is an approximation
     virtual bool is_exact() const { return true; };

symengine/lib/symengine_wrapper.pxd

@@ -121,6 +121,9 @@ cdef class Abs(Function):
 cdef class Gamma(Function):
     pass
 
+cdef class ATan2(Function):
+    pass
+
 cdef class Derivative(Basic):
     pass