From ecf5ba8dbd91ae2a686a0f81705de253d1dbbf6c Mon Sep 17 00:00:00 2001
From: Daniel Krenn <git@danielkrenn.at>
Date: Fri, 28 Aug 2015 17:15:51 +0200
Subject: [PATCH] use simplify/convert everywhere explicit

---
 src/sage/rings/asymptotic/asymptotic_ring.py | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/sage/rings/asymptotic/asymptotic_ring.py b/src/sage/rings/asymptotic/asymptotic_ring.py
index 601d1ab3c4e..01e7f96a7ae 100644
--- a/src/sage/rings/asymptotic/asymptotic_ring.py
+++ b/src/sage/rings/asymptotic/asymptotic_ring.py
@@ -731,7 +731,8 @@ def _add_(self, other):
             sage: O(x) + x
             O(x)
         """
-        return self.parent()(self.summands.union(other.summands), convert=False)
+        return self.parent()(self.summands.union(other.summands),
+                             simplify=True, convert=False)
 
 
     def _sub_(self, other):
@@ -787,8 +788,10 @@ def _mul_term_(self, term):
             sage: expr._mul_term_(t)
             O(x^3)
         """
+        from term_monoid import OTerm
+        simplify = isinstance(term, OTerm)
         return self.parent()(self.summands.mapped(lambda element: term * element),
-                             convert=False)
+                             simplify=simplify, convert=False)
 
 
     def _mul_(self, other):
@@ -928,14 +931,16 @@ def __invert__(self):
             element = next(self.summands.elements())
             new_element = ~element
             if new_element.parent() is element.parent():
-                return self.parent()(new_element)
+                return self.parent()(new_element,
+                                     simplify=False, convert=False)
             else:
                 # Insert an 'if' here once terms can have different
                 # coefficient rings, as this will be for L-terms.
                 new_parent = self.parent().change_parameter(
                     growth_group=new_element.parent().growth_group,
                     coefficient_ring=new_element.parent().coefficient_ring)
-                return new_parent(new_element)
+                return new_parent(new_element,
+                                  simplify=False, convert=False)
 
         max_elem = tuple(self.summands.maximal_elements())
         if len(max_elem) != 1:
@@ -1778,8 +1783,8 @@ def _an_element_(self):
         from sage.rings.asymptotic.term_monoid import TermMonoid
         E = TermMonoid('exact', self.growth_group, self.coefficient_ring)
         O = TermMonoid('O', self.growth_group, self.coefficient_ring)
-        return self(E.an_element(), convert=False)**3 + \
-            self(O.an_element(), convert=False)
+        return self(E.an_element(), simplify=False, convert=False)**3 + \
+            self(O.an_element(), simplify=False, convert=False)
 
 
     def some_elements(self):
@@ -1816,7 +1821,8 @@ def some_elements(self):
         from sage.rings.asymptotic.term_monoid import TermMonoid
         E = TermMonoid('exact', self.growth_group, self.coefficient_ring)
         O = TermMonoid('O', self.growth_group, self.coefficient_ring)
-        return iter(self(e, convert=False)**3 + self(o, convert=False)
+        return iter(self(e, simplify=False, convert=False)**3 +
+                    self(o, simplify=False, convert=False)
                     for e, o in product_diagonal(
                             E.some_elements(), O.some_elements()))
 
@@ -1955,7 +1961,7 @@ def create_summand(self, type, data=None, **kwds):
         if type == 'exact' and kwds.get('coefficient') == 0:
             return self.zero()
 
-        return self(TM(data, **kwds), convert=False)
+        return self(TM(data, **kwds), simplify=False, convert=False)
 
 
     def variable_names(self):