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

Timestamp:

Sep 16, 2004, 12:01:21 PM (21 years ago)

Author:

duncan

Message:

added basic smoothing function to least squares

File:

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

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -12 +12 @@
 class Interpolation(Mesh):
 
-    def __init__(self, vertex_coordinates, triangles, data):
+    def __init__(self, vertex_coordinates, triangles, data_coordinates):
         """ Build interpolation matrix mapping from
         function values at vertices to function values at data points
@@ -24 +24 @@
           integers representing indices of all vertices in the mesh.
 
-          data: List of coordinate pairs [x, y] of data points
+          data_coordinates: List of coordinate pairs [x, y] of data points
           (or an nx2 Numeric array)
           
@@ -33 +33 @@
 
         #Convert input to Numeric arrays
-        data = array(data).astype(Float)
+        data_coordinates = array(data_coordinates).astype(Float)
         vertex_coordinates = array(vertex_coordinates).astype(Float)
         triangles = array(triangles).astype(Int)                
@@ -43 +43 @@
         #Build n x m interpolation matrix        
         m = vertex_coordinates.shape[0] #Number of basis functions (1/vertex)
-        n = data.shape[0]               #Number of data points         
+        n = data_coordinates.shape[0]               #Number of data points         
 
-        self.matrix = zeros((n,m), Float)
+        self.A_m = zeros((n,m), Float)
 
         #Compute matrix elements
         for i in range(n):
-            #For each data point
+            #For each data_coordinate point
 
-            x = data[i]
+            x = data_coordinates[i]
             for k in range(len(self)):
                 #For each triangle (brute force)
@@ -78 +78 @@
                 if sigma0 >= 0 and sigma1 >= 0 and sigma2 >= 0:
 
-                    #Assign values to matrix
+                    #Assign values to A_m
                     j = self.triangles[k,0] #Global vertex id
-                    self.matrix[i, j] = sigma0
+                    self.A_m[i, j] = sigma0
 
                     j = self.triangles[k,1] #Global vertex id
-                    self.matrix[i, j] = sigma1
+                    self.A_m[i, j] = sigma1
 
                     j = self.triangles[k,2] #Global vertex id
-                    self.matrix[i, j] = sigma2
+                    self.A_m[i, j] = sigma2
 
-                
-
-                
-
-                
-                
-                
+    def smooth_to_mesh(self, z):
+        from Numeric import zeros, array, Float,transpose,dot
+        from LinearAlgebra import solve_linear_equations
+        #Convert input to Numeric arrays
+        z = array(z).astype(Float)
+        At_m = transpose(self.A_m)
+        #print "z", z
+        #print "At_m",At_m
+        self.AtA_m = dot(At_m, self.A_m) 
+        Atz_m = dot(At_m, z)
+        f = solve_linear_equations(self.AtA_m,Atz_m)
+        return f