Merge pull request sympy#20175 from sidhu1012/mat

sylee957 · web-flow · commit 5b2eabbb75e0 · 2020-10-24T22:29:40.000+09:00
Comparing matrix with object
diff --git a/sympy/matrices/dense.py b/sympy/matrices/dense.py
@@ -6,7 +6,7 @@
 from sympy.core.expr import Expr
 from sympy.core.singleton import S
 from sympy.core.symbol import Symbol
-from sympy.core.sympify import sympify
+from sympy.core.sympify import sympify, _sympify
 from sympy.functions.elementary.trigonometric import cos, sin
 from sympy.matrices.common import \
     a2idx, classof, ShapeError
@@ -43,7 +43,10 @@ class DenseMatrix(MatrixBase):
     _class_priority = 4
 
     def __eq__(self, other):
-        other = sympify(other)
+        try:
+            other = _sympify(other)
+        except SympifyError:
+            return NotImplemented
         self_shape = getattr(self, 'shape', None)
         other_shape = getattr(other, 'shape', None)
         if None in (self_shape, other_shape):
diff --git a/sympy/matrices/sparse.py b/sympy/matrices/sparse.py
@@ -5,6 +5,7 @@
 from sympy.core.containers import Dict
 from sympy.core.expr import Expr
 from sympy.core.singleton import S
+from sympy.core.sympify import _sympify
 from sympy.functions import Abs
 from sympy.utilities.iterables import uniq
 
@@ -239,6 +240,10 @@ def update(i, j, v):
             return rows, cols, smat
 
     def __eq__(self, other):
+        try:
+            other = _sympify(other)
+        except SympifyError:
+            return NotImplemented
         self_shape = getattr(self, 'shape', None)
         other_shape = getattr(other, 'shape', None)
         if None in (self_shape, other_shape):
diff --git a/sympy/matrices/tests/test_densearith.py b/sympy/matrices/tests/test_densearith.py
@@ -1,6 +1,8 @@
 from sympy.testing.pytest import ignore_warnings
 from sympy.utilities.exceptions import SymPyDeprecationWarning
 
+from sympy.matrices import Matrix, SparseMatrix, ImmutableMatrix
+
 with ignore_warnings(SymPyDeprecationWarning):
     from sympy.matrices.densetools import eye
     from sympy.matrices.densearith import add, sub, mulmatmat, mulmatscaler
@@ -52,3 +54,12 @@ def test_mulmatscaler():
 
     assert mulmatscaler(a, ZZ(4), ZZ) == [[ZZ(4), ZZ(0), ZZ(0)], [ZZ(0), ZZ(4), ZZ(0)], [ZZ(0), ZZ(0), ZZ(4)]]
     assert mulmatscaler(b, ZZ(1), ZZ) == [[ZZ(3), ZZ(7), ZZ(4)], [ZZ(2), ZZ(4), ZZ(5)], [ZZ(6), ZZ(2), ZZ(3)]]
+
+def test_eq():
+    A = Matrix([[1]])
+    B = ImmutableMatrix([[1]])
+    C = SparseMatrix([[1]])
+    assert A != object()
+    assert A != "Matrix([[1]])"
+    assert A == B
+    assert A == C
