Merge pull request #114 from isuruf/number2

Add is_positive, is_negative, etc and update

Author: isuruf

.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,6 +92,10 @@ matrix:
 install:
   - export PYTHON_SOURCE_DIR=`pwd`
   - export TEST_CPP="no"
+  - export MAKEFLAGS="-j2"
+
+  # Setup travis for Python wrappers
+  - source bin/install_travis.sh
 
   - git clone https://github.com/symengine/symengine symengine-cpp
   - cd symengine-cpp
@@ -118,13 +105,10 @@ install:
   # Setup travis for C++ library
   - if [[ "${WITH_SAGE}" != "yes" ]]; then source bin/install_travis.sh; fi
 
-  # Setup travis for Python wrappers
-  - cd $PYTHON_SOURCE_DIR
-  - source bin/install_travis.sh
-
   # Build C++ library
-  - cd symengine-cpp
+  - cd $PYTHON_SOURCE_DIR/symengine-cpp
   - 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

@@ -273,6 +273,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

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.pyx

@@ -720,6 +720,34 @@ cdef class Number(Basic):
     def is_Number(self):
         return True
 
+    @property
+    def is_positive(self):
+        return deref(symengine.rcp_static_cast_Number(self.thisptr)).is_positive()
+
+    @property
+    def is_negative(self):
+        return deref(symengine.rcp_static_cast_Number(self.thisptr)).is_negative()
+
+    @property
+    def is_zero(self):
+        return deref(symengine.rcp_static_cast_Number(self.thisptr)).is_zero()
+
+    @property
+    def is_nonzero(self):
+        return not (self.is_complex or self.is_zero)
+
+    @property
+    def is_nonnegative(self):
+        return not (self.is_complex or self.is_negative)
+
+    @property
+    def is_nonpositive(self):
+        return not (self.is_complex or self.is_positive)
+
+    @property
+    def is_complex(self):
+        return deref(symengine.rcp_static_cast_Number(self.thisptr)).is_complex()
+
 cdef class Integer(Number):
 
     @property

symengine/tests/CMakeLists.txt

@@ -5,7 +5,7 @@ install(FILES __init__.py
     test_eval.py
     test_expr.py
     test_functions.py
-    test_integer.py
+    test_number.py
     test_matrices.py
     test_ntheory.py
     test_sage.py

symengine/tests/test_functions.py

@@ -80,7 +80,7 @@ def test_abs_diff():
 def test_Subs():
     x = Symbol("x")
     y = Symbol("y")
-    _x = Symbol("_x")
+    _x = Symbol("_xi_1")
     f = function_symbol("f", 2*x)
     assert f.diff(x) == 2 * Subs(Derivative(function_symbol("f", _x), [_x]), [_x], [2 * x])
     assert Subs(Derivative(function_symbol("f", x, y), [x]), [x, y], [_x, x]) \

symengine/tests/test_integer.py

@@ -0,0 +1,60 @@
+from symengine.utilities import raises
+
+from symengine import Integer, I
+
+def test_integer():
+    i = Integer(5)
+    assert str(i) == "5"
+
+def test_integer_long():
+    i = Integer(123434444444444444444)
+    assert str(i) == "123434444444444444444"
+
+def test_integer_string():
+    assert Integer("133") == 133
+
+def test_smallfloat_valid():
+    i = Integer(7.5)
+    assert str(i) == "7"
+
+def test_bigfloat_valid():
+    i = Integer(13333333333333334.5)
+    assert str(i) == "13333333333333334"
+
+def test_is_conditions():
+    i = Integer(-123)
+    assert not i.is_zero
+    assert not i.is_positive
+    assert i.is_negative
+    assert i.is_nonzero
+    assert i.is_nonpositive
+    assert not i.is_nonnegative
+    assert not i.is_complex
+
+    i = Integer(123)
+    assert not i.is_zero
+    assert i.is_positive
+    assert not i.is_negative
+    assert i.is_nonzero
+    assert not i.is_nonpositive
+    assert i.is_nonnegative
+    assert not i.is_complex
+
+    i = Integer(0)
+    assert i.is_zero
+    assert not i.is_positive
+    assert not i.is_negative
+    assert not i.is_nonzero
+    assert i.is_nonpositive
+    assert i.is_nonnegative
+    assert not i.is_complex
+
+    i = Integer(1) + I
+    assert not i.is_zero
+    assert not i.is_positive
+    assert not i.is_negative
+    assert not i.is_nonzero
+    assert not i.is_nonpositive
+    assert not i.is_nonnegative
+    assert i.is_complex
+