set DISPLAY_WIDTH to 80 by default + moved extraction of maxwidth and precision values from options in table2str()

Author: alixdamman

larray/core/array.py

@@ -2279,10 +2279,8 @@ def __str__(self):
             return 'LArray([])'
         else:
             maxlines = OPTIONS[MAXLINES] if OPTIONS[MAXLINES] is not None else 200
-            maxwidth = OPTIONS[DISPLAY_WIDTH]
-            precision = OPTIONS[DISPLAY_PRECISION]
             table = list(self.as_table(maxlines))
-            return table2str(table, 'nan', maxwidth=maxwidth, keepcols=self.ndim - 1, precision=precision)
+            return table2str(table, 'nan', keepcols=self.ndim - 1)
     __repr__ = __str__
 
     def __iter__(self):

larray/tests/test_array.py

@@ -309,10 +309,8 @@ def test_str(small_array, array):
 115  A21          F  153105.0  153106.0  153107.0"""
     # too many columns
     assert str(array['P01', 'A11', 'M']) == """\
-age    0       1       2       3       4       5       6       7        8  ...  \
-     106       107       108       109       110       111       112       113       114       115
-     0.0  1320.0  2640.0  3960.0  5280.0  6600.0  7920.0  9240.0  10560.0  ...  \
-139920.0  141240.0  142560.0  143880.0  145200.0  146520.0  147840.0  149160.0  150480.0  151800.0"""
+age    0       1       2  ...       112       113       114       115
+     0.0  1320.0  2640.0  ...  147840.0  149160.0  150480.0  151800.0"""
 
     arr = LArray([0, ''], Axis(['a0', ''], 'a'))
     assert str(arr) == "a  a0  \n    0  "

larray/util/misc.py

@@ -133,14 +133,21 @@ def get_min_width(table, index):
     return max(longest_word(row[index]) for row in table)
 
 
-def table2str(table, missing, summarize=True, maxwidth=80, numedges='auto', sep='  ', cont='...',
+def table2str(table, missing, summarize=True, maxwidth=None, numedges='auto', sep='  ', cont='...',
               keepcols=0, precision=None):
     """
     table is a list of lists
     :type table: list of list
     """
     if not table:
         return ''
+
+    from larray.util.options import OPTIONS, DISPLAY_WIDTH, DISPLAY_PRECISION
+    if maxwidth is None:
+        maxwidth = OPTIONS[DISPLAY_WIDTH]
+    if precision is None:
+        precision = OPTIONS[DISPLAY_PRECISION]
+
     numcol = max(len(row) for row in table)
     # pad rows that have too few columns
     for row in table:

larray/util/options.py

@@ -14,7 +14,7 @@
 
 OPTIONS = {
     DISPLAY_PRECISION: None,
-    DISPLAY_WIDTH: 200,
+    DISPLAY_WIDTH: 80,
     MAXLINES: None,
     EDGEITEMS: 5,
 }
@@ -46,8 +46,8 @@ class set_printoptions(object):
 
     Currently supported options:
 
-    - ``precision``: number of digits of precision for floating point output. Defaults to 8.
-    - ``display_width``: maximum display width for ``repr`` on xarray objects. Defaults to 80.
+    - ``precision``: number of digits of precision for floating point output.
+    - ``display_width``: maximum display width for ``repr`` on larray objects. Defaults to 80.
     - ``maxlines``: Maximum number of lines to show. Default behavior shows all lines.
     - ``edgeitems`` : if number of lines to display is greater than ``maxlines``, only the first and last
       ``edgeitems`` lines are displayed. Only active if ``maxlines`` is not None. Defaults to 5.