Changeset 465

Timestamp:

Oct 29, 2004, 9:58:25 AM (20 years ago)

Author:

ole

Message:

Removed unnecesaary dependency on scipy

Location:

inundation/ga/storm_surge/pyvolution

Files:

• sparse.py (modified) (3 diffs)
• test_least_squares.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/sparse.py

@@ -1 +1 @@
 """Proof of concept sparse matrix code
 """
-from scipy_base import *
+#from scipy_base import *
 from cg_solve import conjugate_gradient, VectorShapeError
 
@@ -125 +125 @@
         from Numeric import array, zeros, Float
         
-        if isscalar(other):
+        try:
+            float(other)
+        except:
+            raise 'only right multiple with scalar implemented'
+        else:
             new = self.copy()
             #Multiply nonzero elements
@@ -132 +136 @@
 
                 new.A[key] = other*new.A[key]
-        else:
-            raise 'only right multiple with scalar implemented'
-
-#        print 'new.shape',new.shape
 
         return new

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -3 +3 @@
 import unittest
 from math import sqrt
-from scipy import mat
+#from scipy import mat
 
 from least_squares import *