Merge pull request #143 from edgarcosta/showgood

pass *args and **kwargs into str methods for all a{r,c}b_* and expand goodstr domain

Author: oscarbenjamin

src/flint/flint_base/flint_base.pyx

@@ -48,15 +48,15 @@ cdef class flint_poly(flint_elem):
         """
         return list(self)
 
-    def str(self, bint ascending=False):
+    def str(self, bint ascending=False, *args, **kwargs):
         """
         Convert to a human-readable string (generic implementation for
         all polynomial types).
 
         If *ascending* is *True*, the monomials are output from low degree to
         high, otherwise from high to low.
         """
-        coeffs = [str(c) for c in self]
+        coeffs = [c.str(*args, **kwargs) for c in self]
         if not coeffs:
             return "0"
         s = []

src/flint/functions/showgood.pyx

@@ -32,11 +32,9 @@ cdef goodstr(x):
         return "(" + ", ".join(goodstr(y) for y in x) + ")"
     if isinstance(x, list):
         return "[" + ", ".join(goodstr(y) for y in x) + "]"
-    if isinstance(x, arb):
-        return x.str(radius=False)
-    if isinstance(x, acb):
+    if isinstance(x, (arb, acb, arb_mat, acb_mat, arb_poly, acb_poly, arb_series, acb_series)):
         return x.str(radius=False)
-    raise TypeError("must have arb or acb")
+    raise TypeError("must be a element/tuple/list of arb, acb, arb_mat, acb_mat, arb_poly, acb_poly, arb_series, or acb_series")
 
 def good(func, slong prec=0, slong maxprec=0, slong dps=0,
         slong maxdps=0, slong padding=10, bint verbose=False, bint show=False, bint parts=True, metric=None):

src/flint/types/acb_series.pyx

@@ -93,9 +93,9 @@ cdef class acb_series(flint_series):
     def repr(self, **kwargs):
         return "acb_series([%s], prec=%s)" % (", ".join(map(str, self)), self.prec)
 
-    def str(self, **kwargs):
+    def str(self, *args, **kwargs):
         if self.prec > 0:
-            s = acb_poly(list(self)).str(ascending=True)
+            s = acb_poly(list(self)).str(ascending=True, *args, **kwargs)
             return s + (" + O(x^%s)" % self.prec)
         elif self.prec == 0:
             return "O(x^0)"

src/flint/types/arb_series.pyx

@@ -88,9 +88,9 @@ cdef class arb_series(flint_series):
     def repr(self, **kwargs):
         return "arb_series([%s], prec=%s)" % (", ".join(map(str, self)), self.prec)
 
-    def str(self, **kwargs):
+    def str(self, *args, **kwargs):
         if self.prec > 0:
-            s = arb_poly(list(self)).str(ascending=True)
+            s = arb_poly(list(self)).str(ascending=True, *args, **kwargs)
             return s + (" + O(x^%s)" % self.prec)
         elif self.prec == 0:
             return "O(x^0)"