numpy array formatter

calcpy/formatters.py

@@ -3,12 +3,13 @@
 import shutil
 import datetime
 import IPython
+import IPython.lib.pretty
+import numpy
 import sympy
 import sympy.combinatorics
 from sympy.printing.pretty.pretty import PrettyPrinter
 from sympy.printing.pretty.stringpict import stringPict, prettyForm
 from sympy.concrete.expr_with_limits import ExprWithLimits
-import IPython.lib.pretty
 
 MAX_SEQ_LENGTH = 100
 
@@ -248,10 +249,17 @@ def sympy_pretty_formatter(obj, printer, cycle):
     n_col, n_row = shutil.get_terminal_size()
     printer.text(sympy.printing.pretty(obj, num_columns=n_col))
 
+def numpy_array_formatter(obj, printer, cycle):
+    return sympy_expr_formatter(sympy.Matrix(obj), printer, cycle)
+
 def previewer_formatter(obj):
     try:
         if isinstance(obj, sympy.Expr):
-            obj_str = IPython.lib.pretty.pretty(evalf(obj))
+            obj_str = IPython.lib.pretty.pretty(obj)
+            if not isinstance(obj, (sympy.Integer, sympy.Float)):
+                evalu_obj = IPython.lib.pretty.pretty(evalf(obj))
+                if obj_str != evalu_obj:
+                    obj_str += " ≈ " + evalu_obj
         elif isinstance(obj, sympy.combinatorics.Cycle):
             obj_str = IPython.lib.pretty.pretty(obj)
         elif isinstance(obj, (list, tuple)):
@@ -301,6 +309,7 @@ def init(ip: IPython.InteractiveShell):
     formatter.for_type(sympy.core.function.FunctionClass, IPython.lib.pretty._function_pprint)
     formatter.for_type(sympy.combinatorics.Permutation, sympy_pretty_formatter)
     formatter.for_type(sympy.combinatorics.Cycle, sympy_pretty_formatter)
+    formatter.for_type(numpy.ndarray, numpy_array_formatter)
 
     # use IPython's float precision
     def print_float(self, e):

calcpy/tests/output.txt

@@ -77,3 +77,19 @@ e
          2          = series(_)
 
 [] = solve(_)
+In [1]: np.arange(4)
+Out[1]: 
+[0]
+[ ]
+[1]
+[ ]
+[2]
+[ ]
+[3]
+In [1]: np.zeros((2,2))
+Out[1]: 
+[0  0]
+[    ]
+[0  0]
+In [1]: np.array([[alpha, gamma, x_1]])
+Out[1]: [alpha  gamma  x_1]

calcpy/tests/test_output.py

@@ -21,6 +21,9 @@ def run_cell(raw_cell):
     sleep(1)
     run_cell('e**(-x**2)?')
     sleep(2)
+    run_cell('np.arange(4)')
+    run_cell('np.zeros((2,2))')
+    run_cell('np.array([[alpha, gamma, x_1]])')
 
 def test_output(ip, capsys):
     run_flow(ip)