Changeset 452 for inundation/ga/storm_surge/pyvolution/least_squares.py

Timestamp:

Oct 26, 2004, 11:55:00 PM (20 years ago)

Author:

steve

Message:

Made some quick and dirty additions to sparse.

File:

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

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -27 +27 @@
 from Numeric import zeros, array, Float, Int, dot, transpose
 from LinearAlgebra import solve_linear_equations
-from scipy import sparse
+#from scipy import sparse
+from sparse import Sparse
 from cg_solve import conjugate_gradient, VectorShapeError
 
@@ -210 +211 @@
         
         #self.A = zeros((n,m), Float)
-        self.A = sparse.dok_matrix()
-        self.AtA = sparse.dok_matrix()
+        self.A = Sparse(n,m)
+
+        #print 'n by m ',self.A
+        self.AtA = Sparse(m,m)
 
         #Compute matrix elements
@@ -265 +268 @@
 
         
-        self.A   = (self.A).tocsc()
-        self.AtA = (self.AtA).tocsc()
-        self.At  =  self.A.transp()
+##         self.A   = (self.A).tocsc()
+##         self.AtA = (self.AtA).tocsc()
+##         self.At  =  self.A.transp()
 
     def get_A(self):
@@ -314 +317 @@
 
         #self.D = zeros((m,m), Float)
-        self.D = sparse.dok_matrix()
+        self.D = Sparse(m,m)
 
         #For each triangle compute contributions to D = D1+D2        
@@ -360 +363 @@
             self.D[v0,v2] += e20             
 
-        self.D = (self.D).tocsc()
+        #self.D = (self.D).tocsc()
             
     def fit(self, z):
@@ -383 +386 @@
         
         #Compute right hand side based on data
-        Atz = self.At * z
-
+        Atz = self.A.trans_mult(z)
+
+
+        #print 'fit: Atz',Atz
+        
         #Check sanity
         n, m = self.A.shape
@@ -485 +491 @@
     """
     import os, sys
-    usage = "usage: %s mesh_input.tsh point.xya  mesh_output.tsh alpha" %         os.path.basename(sys.argv[0])
+    usage = "usage: %s mesh_input.tsh point.xya  mesh_output.tsh alpha" % os.path.basename(sys.argv[0])
 
     if len(sys.argv) < 4: