Changeset 2665

Timestamp:

Apr 6, 2006, 9:47:08 AM (17 years ago)

Author:

ole

Message:

Attempted to fix bug

Location:

inundation/pyvolution

Files:

• least_squares.py (modified) (2 diffs)
• test_least_squares.py (modified) (1 diff)

inundation/pyvolution/least_squares.py

@@ -226 +226 @@
     X = point_coordinates[:,0]
     Y = point_coordinates[:,1]  
-    Z = point_attributes        
+    Z = ensure_numeric(point_attributes)
+    if len(Z.shape) == 1:
+        Z = Z[:, NewAxis]
+        
 
     #Data points inside mesh boundary
@@ -242 +245 @@
     Xi = vertex_coordinates[:,0]
     Eta = vertex_coordinates[:,1]       
-    Zeta = vertex_attributes            
-
-
-
-    if max(Zeta) > max(Zc)*acceptable_fit_overshoot or\
-       min(Zeta) < min(Zc)/acceptable_fit_overshoot:
-        msg = 'Least sqares produced values outside the range of the input '
-        msg += 'data by a factor greater than %.2f. ' %acceptable_fit_overshoot
-        msg += 'Z in [%f, %f], Zeta in [%f, %f].\n' %(min(Zc), max(Zc),
-                                                      min(Zeta), max(Zeta))
-
-        offending_vertices = (Zeta > max(Zc)*acceptable_fit_overshoot) or\
-                             (Zeta < min(Zc)/acceptable_fit_overshoot)
-
-        Xi_c = compress(offending_vertices, Xi)
-        Eta_c = compress(offending_vertices, Eta)
-        offending_coordinates = concatenate((Xi_c[:, NewAxis],
-                                             Eta_c[:, NewAxis]),
-                                            axis=1)
-
-        msg += 'Offending locations:\n %s' %(offending_coordinates)
+    Zeta = ensure_numeric(vertex_attributes)
+    if len(Zeta.shape) == 1:
+        Zeta = Zeta[:, NewAxis]    
+
+    for i in range(Zeta.shape[1]): #For each attribute
+        zeta = Zeta[:,i]
+        z = Z[:,i]                
+        zc = Zc[:,i]        
         
-        raise FittingError, msg
+        if max(zeta) > max(zc)*acceptable_fit_overshoot or\
+           min(zeta) < min(zc)/acceptable_fit_overshoot:
+            msg = 'Least sqares produced values outside the range of the input '
+            msg += 'data by a factor greater than %.2f. ' %acceptable_fit_overshoot
+            msg += 'z in [%f, %f], zeta in [%f, %f].\n' %(min(zc), max(zc),
+                                                          min(zeta), max(zeta))
+
+            offending_vertices = (zeta > max(zc)*acceptable_fit_overshoot) or\
+                                 (zeta < min(zc)/acceptable_fit_overshoot)
+
+            Xi_c = compress(offending_vertices, Xi)
+            Eta_c = compress(offending_vertices, Eta)
+            offending_coordinates = concatenate((Xi_c[:, NewAxis],
+                                                 Eta_c[:, NewAxis]),
+                                                axis=1)
+
+            msg += 'Offending locations:\n %s' %(offending_coordinates)
+            
+            raise FittingError, msg
 
 
     
-    if verbose:
-        print '+------------------------------------------------'
-        print 'Least squares statistics'
-        print '+------------------------------------------------'       
-        print 'points: %d points' %(len(Z))
-        print '    x in [%f, %f]'%(min(X), max(X))
-        print '    y in [%f, %f]'%(min(Y), max(Y))
-        print '    z in [%f, %f]'%(min(Z), max(Z))
-        print
-
-        if indices is not None:
-            print 'Cropped points: %d points' %(len(Zc))
-            print '    x in [%f, %f]'%(min(Xc), max(Xc))
-            print '    y in [%f, %f]'%(min(Yc), max(Yc))
-            print '    z in [%f, %f]'%(min(Zc), max(Zc))
+        if verbose:
+            print '+------------------------------------------------'
+            print 'Least squares statistics'
+            print '+------------------------------------------------'   
+            print 'points: %d points' %(len(z))
+            print '    x in [%f, %f]'%(min(X), max(X))
+            print '    y in [%f, %f]'%(min(Y), max(Y))
+            print '    z in [%f, %f]'%(min(z), max(z))
             print
-        
-
-        print 'Mesh: %d vertices' %(len(Zeta))
-        print '    xi in [%f, %f]'%(min(Xi), max(Xi))
-        print '    eta in [%f, %f]'%(min(Eta), max(Eta))
-        print '    zeta in [%f, %f]'%(min(Zeta), max(Zeta))
-        print '+------------------------------------------------'
+
+            if indices is not None:
+                print 'Cropped points: %d points' %(len(zc))
+                print '    x in [%f, %f]'%(min(Xc), max(Xc))
+                print '    y in [%f, %f]'%(min(Yc), max(Yc))
+                print '    z in [%f, %f]'%(min(zc), max(zc))
+                print
+            
+
+            print 'Mesh: %d vertices' %(len(zeta))
+            print '    xi in [%f, %f]'%(min(Xi), max(Xi))
+            print '    eta in [%f, %f]'%(min(Eta), max(Eta))
+            print '    zeta in [%f, %f]'%(min(zeta), max(zeta))
+            print '+------------------------------------------------'
 
     return vertex_attributes

inundation/pyvolution/test_least_squares.py

@@ -1863 +1863 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Least_Squares,'test_pts')
+    #suite = unittest.makeSuite(Test_Least_Squares,'test_smooth_attributes_to_mesh_function')
+    suite = unittest.makeSuite(Test_Least_Squares,'test_fit_using_fit_to_mesh')
 
     #suite = unittest.makeSuite(Test_Least_Squares,'test_fit_to_msh_netcdf_fileII')