Merge pull request sympy#17929 from oscarbenjamin/repr_elementwise

oscarbenjamin · web-flow · commit b8bfcf4f7257 · 2019-11-20T03:00:36.000Z
Update repr-printing of elementwise functions
diff --git a/sympy/matrices/expressions/applyfunc.py b/sympy/matrices/expressions/applyfunc.py
@@ -17,17 +17,17 @@ class ElementwiseApplyFunction(MatrixExpr):
     >>> from sympy import exp
     >>> X = MatrixSymbol("X", 3, 3)
     >>> X.applyfunc(exp)
-    exp(X...)
+    exp.(X)
 
     Otherwise using the class constructor:
 
     >>> from sympy import eye
     >>> expr = ElementwiseApplyFunction(exp, eye(3))
     >>> expr
-    exp(Matrix([
+    exp.(Matrix([
     [1, 0, 0],
     [0, 1, 0],
-    [0, 0, 1]])...)
+    [0, 0, 1]]))
     >>> expr.doit()
     Matrix([
     [E, 1, 1],
diff --git a/sympy/printing/str.py b/sympy/printing/str.py
@@ -326,7 +326,7 @@ def _print_MatMul(self, expr):
         )
 
     def _print_ElementwiseApplyFunction(self, expr):
-        return "{0}({1}...)".format(
+        return "{0}.({1})".format(
             expr.function,
             self._print(expr.expr),
         )
diff --git a/sympy/printing/tests/test_str.py b/sympy/printing/tests/test_str.py
@@ -813,6 +813,30 @@ def test_MatrixSymbol_printing():
     assert str(A**3) == "A**3"
 
 
+def test_MatrixExpressions():
+    n = Symbol('n', integer=True)
+    X = MatrixSymbol('X', n, n)
+
+    assert str(X) == "X"
+
+    Y = X[1:2:3, 4:5:6]
+
+    assert str(Y) == "X[1:3, 4:6]"
+
+    Z = X[1:10:2]
+
+    assert str(Z) == "X[1:10:2, :n]"
+
+    # Apply function elementwise (`ElementwiseApplyFunc`):
+
+    expr = (X.T*X).applyfunc(sin)
+    assert str(expr) == 'sin.(X.T*X)'
+
+    lamda = Lambda(x, 1/x)
+    expr = (n*X).applyfunc(lamda)
+    assert str(expr) == 'Lambda(_d, 1/_d).(n*X)'
+
+
 def test_Subs_printing():
     assert str(Subs(x, (x,), (1,))) == 'Subs(x, x, 1)'
     assert str(Subs(x + y, (x, y), (1, 2))) == 'Subs(x + y, (x, y), (1, 2))'

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ def _print_MatMul(self, expr):`
`326`	`326`	`)`
`327`	`327`
`328`	`328`	`def _print_ElementwiseApplyFunction(self, expr):`
`329`		`- return "{0}({1}...)".format(`
	`329`	`+ return "{0}.({1})".format(`
`330`	`330`	`expr.function,`
`331`	`331`	`self._print(expr.expr),`
`332`	`332`	`)`