Changeset 7887

Timestamp:

Jul 2, 2010, 9:38:46 AM (14 years ago)

Author:

steve

Message:

Changed back to old version of sparse to get test_all.py working again.

File:

• trunk/anuga_core/source/anuga/utilities/sparse.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/utilities/sparse.py

@@ -297 +297 @@
     def __mul__(self, other):
         """Multiply this matrix onto 'other' which can either be
-        a numeric vector.
+        a numeric vector, a numeric matrix or another sparse matrix.
         """
 
@@ -303 +303 @@
             B = num.array(other)
         except:
-            raise ValueError, 'FIXME: Only numeric types implemented so far'
-
-
-        # Assume numeric types from now on
-
-        if len(B.shape) == 0:
-            # Scalar - use __rmul__ method
-            #R = B*self
-            raise TypeError, 'Sparse matrix X scalar not implemented'
-
-        elif len(B.shape) == 1:
-            # Vector
-            msg = 'Mismatching dimensions: You cannot multiply (%d x %d) matrix onto %d-vector'\
-                  %(self.M, self.N, B.shape[0])
-            assert B.shape[0] == self.N, msg
-
-            R = csr_mv(self,B)
-
-
-        elif len(B.shape) == 2:
-            raise TypeError, 'Sparse matrix X matrix multiplication not implemented'
-
-        else:
-            raise ValueError, 'Dimension too high: d=%d' %len(B.shape)
-
-        return R
-
+            print 'FIXME: Only numeric types implemented so far'
+
+        return csr_mv(self,B)