Before of this patch, this calculation returned an AssertionError
(see issue #1051).
Adopted approach is to not use the assumptions framework for this
calculation. This is faster, but also, since we are slowly moving
the assumption system out of the core, this will have to be how
things are done inside the core.
---
sympy/functions/elementary/complexes.py | 10 ++++++----
sympy/functions/elementary/tests/test_complexes.py | 10 ++++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/sympy/functions/elementary/complexes.py
b/sympy/functions/elementary/complexes.py
index 250d808..b331f08 100644
--- a/sympy/functions/elementary/complexes.py
+++ b/sympy/functions/elementary/complexes.py
@@ -1,5 +1,6 @@
-from sympy.core.basic import Basic, S, C, sympify
+from sympy.core.basic import Basic, S, C
+from sympy.core.numbers import Real
from sympy.core.function import Function
from sympy.functions.elementary.miscellaneous import sqrt
@@ -232,9 +233,10 @@ def canonize(cls, arg):
def eval(cls, arg):
if arg is S.NaN:
return S.NaN
- if arg.is_zero: return arg
- if arg.is_positive: return arg
- if arg.is_negative: return -arg
+ _evalf = arg.evalf()
+ if isinstance(_evalf, Real):
+ if _evalf >= 0: return arg
+ else: return -arg
coeff, terms = arg.as_coeff_terms()
if coeff is not S.One:
return cls(coeff) * cls(C.Mul(*terms))
diff --git a/sympy/functions/elementary/tests/test_complexes.py
b/sympy/functions/elementary/tests/test_complexes.py
index 28d97a9..5ee4314 100644
--- a/sympy/functions/elementary/tests/test_complexes.py
+++ b/sympy/functions/elementary/tests/test_complexes.py
@@ -1,6 +1,6 @@
from sympy import symbols, Symbol, sqrt, oo, re, nan, im, sign, I, E, log, \
- pi, arg, conjugate, expand
-from sympy.utilities.pytest import XFAIL
+ pi, arg, conjugate
+from sympy.functions import sin, cos
def test_re():
@@ -97,6 +97,12 @@ def test_abs():
n = Symbol('n',integer=True)
assert x**(2*n) == abs(x)**(2*n)
+def test_abs_sin_cos():
+ assert abs(sin(1)) == sin(1)
+ assert abs(sin(0.1)) == sin(0.1)
+ assert abs(sin(4)) != sin(4)
+ assert abs(cos(0.2)) == cos(0.2)
+
def test_abs_real():
# test some properties of abs that only apply
# to real numbers
--
1.6.1.2
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sympy-patches" group.
To post to this group, send email to sympy-patches@googlegroups.com
To unsubscribe from this group, send email to
sympy-patches+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/sympy-patches?hl=en
-~----------~----~----~----~------~----~------~--~---
