Changeset 606

Timestamp:

Nov 22, 2004, 12:18:16 AM (20 years ago)

Author:

steve

Message:

Converted B matrix to CSR format in least squares

File:

• inundation/ga/storm_surge/pyvolution/least_squares.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -30 +30 @@
 from Numeric import zeros, array, Float, Int, dot, transpose
 from LinearAlgebra import solve_linear_equations
-from sparse import Sparse
+from sparse import Sparse, Sparse_CSR
 from cg_solve import conjugate_gradient, VectorShapeError
 
@@ -203 +203 @@
                 self.B = self.AtA
 
-
+            #Convert self.B matrix to CSR format for faster matrix vector
+            self.B = Sparse_CSR(self.B)
         
     def build_interpolation_matrix_A(self, point_coordinates):
@@ -515 +516 @@
 
 
+
         return conjugate_gradient(self.B, Atz, Atz,imax=2*len(Atz) )
         #FIXME: Should we store the result here for later use? (ON)