On Friday, May 22, 2015 at 6:13:28 PM UTC+2, kcrisman wrote: > > > http://git.sagemath.org/sage.git/diff/?id=75ab6f97a1bcf94a6fe4eb30d84dade96830b802 > > - related to http://trac.sagemath.org/ticket/17777 and if you go up the > commit tree a little you see something about a "temporary merge". >
$ git log --graph --oneline 5609e513405ba231b522ff68d8f88fe9cf0caeff ^HEAD * 5609e51 17777: fix doctests * 3330a2f Merge branch 'develop' into t/17777/unsigned_infinity_cannot_be_coerced_into_sr * 0d05dd2 Merge branch 'develop' into t/17777/unsigned_infinity_cannot_be_coerced_into_sr * 17d1aa1 17777: coerce unsigned infinity into SR I see the same if I click on the trac "commits" link Confusing, since when I click on the link u/rws/unsigned_infinity_cannot_be_coerced_into_sr > I just get that last commit but there is another non-merge commit. > When I click on the link (= go to http://git.sagemath.org/sage.git/diff/?id=75ab6f97a1bcf94a6fe4eb30d84dade96830b802) it shows me the same as what I get on the commandline, which is what the branch effectively contributes to Sage: $ git diff HEAD...5609e513405ba231b522ff68d8f88fe9cf0caeff diff --git a/src/sage/rings/infinity.py b/src/sage/rings/infinity.py index 3a9577c..da1d585 100644 --- a/src/sage/rings/infinity.py +++ b/src/sage/rings/infinity.py @@ -469,7 +469,7 @@ class AnInfinity(object): sage: SR(infinity) / unsigned_infinity Traceback (most recent call last): ... - ValueError: unsigned oo times smaller number not defined + RuntimeError: indeterminate expression: 0 * infinity encountered. """ return self * ~other diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx index 77aea5a..a531a63 100644 --- a/src/sage/symbolic/expression.pyx +++ b/src/sage/symbolic/expression.pyx @@ -2710,7 +2710,7 @@ cdef class Expression(CommutativeRingElement): sage: x*unsigned_infinity Traceback (most recent call last): ... - ValueError: oo times number < oo not defined + RuntimeError: indeterminate expression: infinity * f(x) encountered. sage: SR(oo)*SR(oo) +Infinity diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx index d883c62..9512b98 100644 --- a/src/sage/symbolic/ring.pyx +++ b/src/sage/symbolic/ring.pyx @@ -103,6 +103,8 @@ cdef class SymbolicRing(CommutativeRing): 2 sage: SR.coerce(-infinity) -Infinity + sage: SR.coerce(unsigned_infinity) + Infinity sage: SR.has_coerce_map_from(ZZ['t']) True sage: SR.has_coerce_map_from(ZZ['t,u,v']) @@ -117,6 +119,8 @@ cdef class SymbolicRing(CommutativeRing): True sage: SR.has_coerce_map_from(GF(9, 'a')) True + sage: SR.has_coerce_map_from(UnsignedInfinityRing) + True TESTS: @@ -163,7 +167,8 @@ cdef class SymbolicRing(CommutativeRing): from sage.rings.polynomial.multi_polynomial_ring import is_MPolynomialRing from sage.rings.all import (ComplexField, - RLF, CLF, AA, QQbar, InfinityRing) + RLF, CLF, AA, QQbar, InfinityRing, + UnsignedInfinityRing) from sage.rings.finite_rings.finite_field_base import is_FiniteField from sage.interfaces.maxima import Maxima @@ -180,7 +185,7 @@ cdef class SymbolicRing(CommutativeRing): elif is_PolynomialRing(R) or is_MPolynomialRing(R) or is_FractionField(R): base = R.base_ring() return base is not self and self.has_coerce_map_from(base) - elif (R is InfinityRing + elif (R is InfinityRing or R is UnsignedInfinityRing or is_RealIntervalField(R) or is_ComplexIntervalField(R) or is_IntegerModRing(R) or is_FiniteField(R)): return True -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
