Merge branch 'u/cheuberg/asy/prototype' of trac.sagemath.org:sage int…

…o t/19083/asy/prototype * 'u/cheuberg/asy/prototype' of trac.sagemath.org:sage: Trac #19083: added doctest (comment 64.23) Trac #19083: Mention "GrowthGroup" in docstring of "GrowthGroupFactory"
sagemath · Oct 16, 2015 · 44b52d6 · 44b52d6
2 parents d925157 + 0042756
commit 44b52d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/sage/rings/asymptotic/growth_group.py b/src/sage/rings/asymptotic/growth_group.py
@@ -3503,6 +3503,10 @@ class GrowthGroupFactory(sage.structure.factory.UniqueFactory):
 
     An asymptotic growth group.
 
+    .. NOTE::
+
+        An instance of this factory is available as ``GrowthGroup``.
+
     EXAMPLES::
 
         sage: from sage.rings.asymptotic.growth_group import GrowthGroup

diff --git a/src/sage/rings/asymptotic/term_monoid.py b/src/sage/rings/asymptotic/term_monoid.py
@@ -1480,6 +1480,12 @@ def _coerce_map_from_(self, S):
             Generic Term Monoid x^QQ with (implicit) coefficients in Rational Field
             sage: T_QQ.has_coerce_map_from(T_ZZ)  # indirect doctest
             True
+            sage: T_QQ_ZZ = GenericTermMonoid(G_QQ, ZZ); T_QQ_ZZ
+            Generic Term Monoid x^QQ with (implicit) coefficients in Integer Ring
+            sage: T_QQ.has_coerce_map_from(T_QQ_ZZ)
+            True
+            sage: T_QQ_ZZ.has_coerce_map_from(T_QQ)
+            False
 
         ::