Merge pull request #231 from isuruf/count_ops

Implement count_ops

Author: isuruf

.travis.yml

@@ -53,7 +53,7 @@ matrix:
           packages:
           - binutils-dev
           - g++-4.8
-    - env: BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.5" WITH_LLVM="3.8" WITH_SCIPY="yes"
+    - env: BUILD_TYPE="Debug" WITH_BFD="yes" PYTHON_VERSION="3.5" WITH_LLVM="3.8" WITH_SCIPY="yes" BUILD_SHARED_LIBS="yes"
       compiler: clang
       os: linux
       addons:

bin/install_travis.sh

@@ -19,9 +19,11 @@ fi
 
 if [[ "${WITH_SAGE}" == "yes" ]]; then
     # This is split to avoid the 10 minute limit
-    conda install -q sagelib
-    export conda_pkgs="${conda_pkgs} sage";
+    conda install -q sagelib=8.1
+    conda clean --all
+    export conda_pkgs="${conda_pkgs} sage=8.1";
 fi
 
 conda install -q ${conda_pkgs}
+conda clean --all
 source activate $our_install_dir;

symengine/__init__.py

@@ -11,7 +11,7 @@
         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)
+        isprime, sqrt_mod, Expr, cse, count_ops)
 from .utilities import var, symbols
 from .functions import *
 

symengine/lib/symengine.pxd

@@ -893,6 +893,7 @@ cdef extern from "<symengine/visitor.h>" namespace "SymEngine":
     bool has_symbol(const Basic &b, const Symbol &x) nogil except +
     rcp_const_basic coeff(const Basic &b, const Basic &x, const Basic &n) nogil except +
     set_basic free_symbols(const Basic &b) nogil except +
+    unsigned count_ops(const vec_basic &a) nogil
 
 cdef extern from "<symengine/logic.h>" namespace "SymEngine":
     cdef cppclass Boolean(Basic):

symengine/lib/symengine_wrapper.pyx

@@ -4933,5 +4933,21 @@ def cse(exprs):
     return (vec_pair_to_list(replacements), vec_basic_to_list(reduced_exprs))
 
 
+cdef _flattened_vec(symengine.vec_basic &vec, exprs):
+    cdef Basic b
+    if is_sequence(exprs):
+        for expr in exprs:
+            _flattened_vec(vec, expr)
+    else:
+        b = sympify(exprs)
+        vec.push_back(b.thisptr)
+
+
+def count_ops(*exprs):
+    cdef symengine.vec_basic vec
+    _flattened_vec(vec, exprs)
+    return symengine.count_ops(vec)
+
+
 # Turn on nice stacktraces:
 symengine.print_stack_on_segfault()

symengine/tests/test_arit.py

@@ -1,7 +1,7 @@
 from symengine.utilities import raises
 
-from symengine import Symbol, Integer, Add, Mul, Pow, Rational, sqrt
-from symengine.lib.symengine_wrapper import Zero, One, NegativeOne, Half, I
+from symengine import (Symbol, Integer, Add, Mul, Pow, Rational, sqrt,
+    symbols, S, I, count_ops)
 
 
 def test_arit1():
@@ -221,10 +221,10 @@ def test_copy():
 
 
 def test_special_constants():
-    assert Zero() == Integer(0)
-    assert One() == Integer(1)
-    assert NegativeOne() == Integer(-1)
-    assert Half() == Rational(1, 2)
+    assert S.Zero == Integer(0)
+    assert S.One == Integer(1)
+    assert S.NegativeOne == Integer(-1)
+    assert S.Half == Rational(1, 2)
 
 
 def test_bool():
@@ -233,3 +233,12 @@ def test_bool():
         assert True
     if (x**2).args[1] < 0:
         assert False
+
+
+def test_count_ops():
+    x, y = symbols("x, y")
+    assert count_ops(x+y) == 1
+    assert count_ops((x+y, x*y)) == 2
+    assert count_ops([[x**y], [x+y-1]]) == 3
+    assert count_ops(x+y, x*y) == 2
+

symengine_version.txt

@@ -1 +1 @@
-fff6755331226a08f0b14571bfbce2b23001d911
+b3a2159b7e6950726157626069c30712427d55b2