Changeset 1820

Timestamp:

Sep 12, 2005, 6:05:53 PM (19 years ago)

Author:

ole

Message:

Refactored how interpolation_function reports it's statistics. Now it usus the repr method.

File:

• inundation/pyvolution/least_squares.py (modified) (8 diffs)

inundation/pyvolution/least_squares.py

@@ -961 +961 @@
 
         #Use keys if no names are specified
-        if quantity_names is not None:
-            self.quantity_names = quantity_names
-        else:
-            self.quantity_names = quantities.keys()
+        if quantity_names is None:
+            quantity_names = quantities.keys()
 
 
@@ -977 +975 @@
             self.spatial = True            
             
+
   
-        #      
+        #Save for use with statistics
+        self.quantity_names = quantity_names        
+        self.quantities = quantities        
+        self.vertex_coordinates = vertex_coordinates 
         self.interpolation_points = interpolation_points
         self.T = time[:]  #Time assumed to be relative to starttime
@@ -993 +995 @@
 
             try:
-                interpolation_points = ensure_numeric(interpolation_points)
+                self.interpolation_points =\
+                                          ensure_numeric(self.interpolation_points)
             except:
                 msg = 'Interpolation points must be an N x 2 Numeric array '+\
                       'or a list of points\n'
-                msg += 'I got: %s.' %( str(interpolation_points)[:60] + '...')
+                msg += 'I got: %s.' %( str(self.interpolation_points)[:60] + '...')
                 raise msg
 
@@ -1004 +1007 @@
                 self.precomputed_values[name] =\
                                               zeros((len(self.T),
-                                                     len(interpolation_points)),
+                                                     len(self.interpolation_points)),
                                                     Float)
 
@@ -1010 +1013 @@
             interpol = Interpolation(vertex_coordinates,
                                      triangles,
-                                     point_coordinates = interpolation_points,
+                                     point_coordinates = self.interpolation_points,
                                      alpha = 0,
                                      precrop = False, 
@@ -1025 +1028 @@
             #Report
             if verbose:
-                #FIXME: Move to e.g. __repr__
-                x = vertex_coordinates[:,0]
-                y = vertex_coordinates[:,1]                
-            
-                print '------------------------------------------------'
-                print 'Interpolation_function statistics:'
-                print '  Extent:'
-                print '    x in [%f, %f], len(x) == %d'\
-                      %(min(x), max(x), len(x))
-                print '    y in [%f, %f], len(y) == %d'\
-                      %(min(y), max(y), len(y))
-                print '    t in [%f, %f], len(t) == %d'\
-                      %(min(self.T), max(self.T), len(self.T))
-                print '  Quantities:'
-                for name in quantity_names:
-                    q = quantities[name][:].flat
-                    print '    %s in [%f, %f]' %(name, min(q), max(q))
-                print '  Interpolation points (xi, eta):'\
-                      ' number of points == %d ' %interpolation_points.shape[0]
-                print '    xi in [%f, %f]' %(min(interpolation_points[:,0]),
-                                             max(interpolation_points[:,0]))
-                print '    eta in [%f, %f]' %(min(interpolation_points[:,1]),
-                                              max(interpolation_points[:,1]))
-                print '  Interpolated quantities (over all timesteps):'
-                
-                for name in quantity_names:
-                    q = self.precomputed_values[name][:].flat
-                    print '    %s at interpolation points in [%f, %f]'\
-                          %(name, min(q), max(q))
-                print '------------------------------------------------'
+                print self.statistics()
+                #self.print_statistics()
             
         else:
@@ -1077 +1052 @@
 
     def __repr__(self):
-        return 'Interpolation function (spation-temporal)'
+        #return 'Interpolation function (spation-temporal)'
+        return self.statistics()
+    
 
     def __call__(self, t, point_id = None, x = None, y = None):
@@ -1199 +1176 @@
 
 
+    def statistics(self):
+        """Output statistics about interpolation_function
+        """
+        
+        vertex_coordinates = self.vertex_coordinates
+        interpolation_points = self.interpolation_points               
+        quantity_names = self.quantity_names
+        quantities = self.quantities
+        precomputed_values = self.precomputed_values                 
+                
+        x = vertex_coordinates[:,0]
+        y = vertex_coordinates[:,1]                
+
+        str =  '------------------------------------------------\n'
+        str += 'Interpolation_function (spation-temporal) statistics:\n'
+        str += '  Extent:\n'
+        str += '    x in [%f, %f], len(x) == %d\n'\
+               %(min(x), max(x), len(x))
+        str += '    y in [%f, %f], len(y) == %d\n'\
+               %(min(y), max(y), len(y))
+        str += '    t in [%f, %f], len(t) == %d\n'\
+               %(min(self.T), max(self.T), len(self.T))
+        str += '  Quantities:\n'
+        for name in quantity_names:
+            q = quantities[name][:].flat
+            str += '    %s in [%f, %f]\n' %(name, min(q), max(q))
+        str += '  Interpolation points (xi, eta):'\
+               ' number of points == %d\n' %interpolation_points.shape[0]
+        str += '    xi in [%f, %f]\n' %(min(interpolation_points[:,0]),
+                                        max(interpolation_points[:,0]))
+        str += '    eta in [%f, %f]\n' %(min(interpolation_points[:,1]),
+                                         max(interpolation_points[:,1]))
+        str += '  Interpolated quantities (over all timesteps):\n'
+        
+        for name in quantity_names:
+            q = precomputed_values[name][:].flat
+            str += '    %s at interpolation points in [%f, %f]\n'\
+                   %(name, min(q), max(q))
+        str += '------------------------------------------------\n'
+
+        return str
+
+        #FIXME: Delete
+        #print '------------------------------------------------'
+        #print 'Interpolation_function statistics:'
+        #print '  Extent:'
+        #print '    x in [%f, %f], len(x) == %d'\
+        #      %(min(x), max(x), len(x))
+        #print '    y in [%f, %f], len(y) == %d'\
+        #      %(min(y), max(y), len(y))
+        #print '    t in [%f, %f], len(t) == %d'\
+        #      %(min(self.T), max(self.T), len(self.T))
+        #print '  Quantities:'
+        #for name in quantity_names:
+        #    q = quantities[name][:].flat
+        #    print '    %s in [%f, %f]' %(name, min(q), max(q))
+        #print '  Interpolation points (xi, eta):'\
+        #      ' number of points == %d ' %interpolation_points.shape[0]
+        #print '    xi in [%f, %f]' %(min(interpolation_points[:,0]),
+        #                             max(interpolation_points[:,0]))
+        #print '    eta in [%f, %f]' %(min(interpolation_points[:,1]),
+        #                              max(interpolation_points[:,1]))
+        #print '  Interpolated quantities (over all timesteps):'
+        #
+        #for name in quantity_names:
+        #    q = precomputed_values[name][:].flat
+        #    print '    %s at interpolation points in [%f, %f]'\
+        #          %(name, min(q), max(q))
+        #print '------------------------------------------------'