Add tests

sylee957 · sylee957 · commit 7c63c98a30de · 2020-04-30T07:46:10.000+09:00
diff --git a/sympy/matrices/dense.py b/sympy/matrices/dense.py
@@ -42,8 +42,6 @@ class DenseMatrix(MatrixBase):
     _op_priority = 10.01
     _class_priority = 4
 
-    __hash__ = None
-
     def __eq__(self, other):
         other = sympify(other)
         self_shape = getattr(self, 'shape', None)
@@ -292,6 +290,8 @@ def _force_mutable(x):
 
 
 class MutableDenseMatrix(DenseMatrix, MatrixBase):
+    __hash__ = None
+
     def __new__(cls, *args, **kwargs):
         return cls._new(*args, **kwargs)
 
diff --git a/sympy/matrices/expressions/tests/test_matexpr.py b/sympy/matrices/expressions/tests/test_matexpr.py
@@ -112,11 +112,15 @@ def test_subs():
     C = MatrixSymbol('C', m, l)
 
     assert A.subs(n, m).shape == (m, m)
-
     assert (A*B).subs(B, C) == A*C
-
     assert (A*B).subs(l, n).is_square
 
+    A = SparseMatrix([[1, 2], [3, 4]])
+    B = Matrix([[1, 2], [3, 4]])
+    C, D = MatrixSymbol('C', 2, 2), MatrixSymbol('D', 2, 2)
+
+    assert (C*D).subs({C: A, D: B}) == MatMul(A, B)
+
 
 def test_ZeroMatrix():
     A = MatrixSymbol('A', n, m)
diff --git a/sympy/matrices/immutable.py b/sympy/matrices/immutable.py
@@ -20,7 +20,7 @@ def sympify_mpmath_matrix(arg):
 sympify_converter[_matrix] = sympify_mpmath_matrix
 
 
-class ImmutableDenseMatrix(MatrixExpr, DenseMatrix):
+class ImmutableDenseMatrix(DenseMatrix, MatrixExpr):
     """Create an immutable version of a matrix.
 
     Examples
@@ -48,6 +48,8 @@ class ImmutableDenseMatrix(MatrixExpr, DenseMatrix):
     def __new__(cls, *args, **kwargs):
         return cls._new(*args, **kwargs)
 
+    __hash__ = MatrixExpr.__hash__
+
     @classmethod
     def _new(cls, *args, **kwargs):
         if len(args) == 1 and isinstance(args[0], ImmutableDenseMatrix):
@@ -131,7 +133,7 @@ def is_diagonalizable(self, reals_only=False, **kwargs):
 ImmutableMatrix = ImmutableDenseMatrix
 
 
-class ImmutableSparseMatrix(MatrixExpr, SparseMatrix):
+class ImmutableSparseMatrix(SparseMatrix, MatrixExpr):
     """Create an immutable version of a sparse matrix.
 
     Examples
@@ -159,6 +161,8 @@ class ImmutableSparseMatrix(MatrixExpr, SparseMatrix):
     def __new__(cls, *args, **kwargs):
         return cls._new(*args, **kwargs)
 
+    __hash__ = MatrixExpr.__hash__
+
     @classmethod
     def _new(cls, *args, **kwargs):
         s = MutableSparseMatrix(*args)
diff --git a/sympy/matrices/matrices.py b/sympy/matrices/matrices.py
@@ -1265,10 +1265,12 @@ def cross(self, b):
         multiply
         multiply_elementwise
         """
-        if not is_sequence(b):
+        from sympy.matrices.expressions.matexpr import MatrixExpr
+
+        if not isinstance(b, MatrixBase) and not isinstance(b, MatrixExpr):
             raise TypeError(
-                "`b` must be an ordered iterable or Matrix, not %s." %
-                type(b))
+                "{} must be a Matrix, not {}.".format(b, type(b)))
+
         if not (self.rows * self.cols == b.rows * b.cols == 3):
             raise ShapeError("Dimensions incorrect for cross product: %s x %s" %
                              ((self.rows, self.cols), (b.rows, b.cols)))
diff --git a/sympy/matrices/tests/test_immutable.py b/sympy/matrices/tests/test_immutable.py
@@ -1,29 +1,34 @@
 from itertools import product
 
 from sympy import (ImmutableMatrix, Matrix, eye, zeros, S, Equality,
-        Unequality, ImmutableSparseMatrix, SparseMatrix, sympify,
-        integrate)
+        Unequality, SparseMatrix, sympify, integrate)
+from sympy.matrices.immutable import \
+    ImmutableDenseMatrix, ImmutableSparseMatrix
 from sympy.abc import x, y
 from sympy.testing.pytest import raises
 
-IM = ImmutableMatrix([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
-ieye = ImmutableMatrix(eye(3))
+IM = ImmutableDenseMatrix([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
+ISM = ImmutableSparseMatrix([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
+ieye = ImmutableDenseMatrix(eye(3))
 
 
-def test_immutable_creation():
-    assert IM.shape == (3, 3)
-    assert IM[1, 2] == 6
-    assert IM[2, 2] == 9
+def test_creation():
+    assert IM.shape == ISM.shape == (3, 3)
+    assert IM[1, 2] == ISM[1, 2] == 6
+    assert IM[2, 2] == ISM[2, 2] == 9
 
 
 def test_immutability():
     with raises(TypeError):
         IM[2, 2] = 5
+        ISM[2, 2]
 
 
 def test_slicing():
-    assert IM[1, :] == ImmutableMatrix([[4, 5, 6]])
-    assert IM[:2, :2] == ImmutableMatrix([[1, 2], [4, 5]])
+    assert IM[1, :] == ImmutableDenseMatrix([[4, 5, 6]])
+    assert IM[:2, :2] == ImmutableDenseMatrix([[1, 2], [4, 5]])
+    assert ISM[1, :] == ImmutableSparseMatrix([[4, 5, 6]])
+    assert ISM[:2, :2] == ImmutableSparseMatrix([[1, 2], [4, 5]])
 
 
 def test_subs():
@@ -41,11 +46,13 @@ def test_subs():
 
 
 def test_as_immutable():
-    X = Matrix([[1, 2], [3, 4]])
-    assert sympify(X) == X.as_immutable() == ImmutableMatrix([[1, 2], [3, 4]])
-    X = SparseMatrix(5, 5, {})
-    assert sympify(X) == X.as_immutable() == ImmutableSparseMatrix(
-            [[0 for i in range(5)] for i in range(5)])
+    data = [[1, 2], [3, 4]]
+    X = Matrix(data)
+    assert sympify(X) == X.as_immutable() == ImmutableMatrix(data)
+
+    data = {(0, 0): 1, (0, 1): 2, (1, 0): 3, (1, 1): 4}
+    X = SparseMatrix(2, 2, data)
+    assert sympify(X) == X.as_immutable() == ImmutableSparseMatrix(2, 2, data)
 
 
 def test_function_return_types():
diff --git a/sympy/physics/quantum/tests/test_tensorproduct.py b/sympy/physics/quantum/tests/test_tensorproduct.py
@@ -1,4 +1,6 @@
-from sympy import I, symbols, Matrix
+from sympy import I, symbols
+from sympy.core.expr import unchanged
+from sympy.matrices import Matrix, SparseMatrix
 
 from sympy.physics.quantum.commutator import Commutator as Comm
 from sympy.physics.quantum.tensorproduct import TensorProduct
@@ -17,6 +19,11 @@
 mat2 = Matrix([[2*I, 3], [4*I, 2]])
 
 
+def test_sparse_matrices():
+    spm = SparseMatrix.diag(1, 0)
+    assert unchanged(TensorProduct, spm, spm)
+
+
 def test_tensor_product_dagger():
     assert Dagger(TensorProduct(I*A, B)) == \
         -I*TensorProduct(Dagger(A), Dagger(B))
