Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'u/kcrisman/ticket/17493' of git://trac.sagemath.org/sag…
Browse files Browse the repository at this point in the history
…e into i17493
  • Loading branch information
rwst committed Mar 14, 2016
2 parents 1c17d9e + a514394 commit f89b9e8
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
16 changes: 16 additions & 0 deletions build/pkgs/sympy/patches/03_bind-zoo.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/sympy/core/numbers.py b/sympy/core/numbers.py
--- a/sympy/core/numbers.py
+++ b/sympy/core/numbers.py
@@ -2857,6 +2857,11 @@ def _eval_power(self, expt):
return S.ComplexInfinity
else:
return S.Zero
+
+ def _sage_(self):
+ import sage.all as sage
+ return sage.UnsignedInfinityRing.gen()
+

zoo = S.ComplexInfinity


23 changes: 23 additions & 0 deletions src/sage/rings/infinity.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,12 @@ def __init__(self):
sage: sage.rings.infinity.UnsignedInfinityRing_class() is sage.rings.infinity.UnsignedInfinityRing_class() is UnsignedInfinityRing
True
Sage can understand SymPy's complex infinity (:trac:`17493`)::
sage: import sympy
sage: SR(sympy.zoo)
Infinity
"""
ParentWithGens.__init__(self, self, names=('oo',), normalize=False)

Expand Down Expand Up @@ -903,6 +909,23 @@ def _mul_(self, other):
return self
raise ValueError("unsigned oo times smaller number not defined")

def _sympy_(self):
"""
Converts ``unsigned_infinity`` to sympy ``zoo``.
EXAMPLE::
sage: import sympy
sage: sympy.sympify(unsigned_infinity)
zoo
sage: gamma(-3)._sympy_() is sympy.factorial(-2)
True
sage: gamma(-3) is sympy.factorial(-2)._sage_()
True
"""
import sympy
return sympy.zoo


unsigned_infinity = UnsignedInfinityRing.gen(0)
less_than_infinity = UnsignedInfinityRing.less_than_infinity()
Expand Down

0 comments on commit f89b9e8

Please sign in to comment.