Changeset 1787

Timestamp:

Aug 31, 2005, 3:15:42 PM (20 years ago)

Author:

ole

Message:

Better output

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• least_squares.py (modified) (2 diffs)

inundation/pyvolution/data_manager.py

@@ -1173 +1173 @@
     global_index = 0
     for i in range(nrows):
-        if verbose: print 'Processing row %d of %d' %(i, nrows)
+        if verbose and i%((nrows+10)/10)==0:
+            print 'Processing row %d of %d' %(i, nrows)        
+        
         lower_index = global_index
         tpoints = zeros((ncols_in_bounding_box, 2), Float)
@@ -1567 +1569 @@
 
     #Store data
+    n = len(lines[6:])
     for i, line in enumerate(lines[6:]):
         fields = line.split()
-        if verbose: print 'Processing row %d of %d' %(i, nrows)
+        if verbose and i%((n+10)/10)==0:
+            print 'Processing row %d of %d' %(i, nrows)            
 
         elevation[i, :] = array([float(x) for x in fields])

inundation/pyvolution/least_squares.py

@@ -263 +263 @@
                  triangles,
                  point_coordinates = None,
-                 alpha = DEFAULT_ALPHA,
+                 alpha = None,
                  verbose = False,
                  expand_search = True,
@@ -327 +327 @@
 
         #Smoothing parameter
-        self.alpha = alpha
+        if alpha is None:
+            self.alpha = DEFAULT_ALPHA
+        else:    
+            self.alpha = alpha
 
         #Build coefficient matrices