Changeset 1753 for inundation/pyvolution/quantity.py

Timestamp:

Aug 24, 2005, 1:49:47 PM (19 years ago)

Author:

ole

Message:

Embedded caching functionality within quantity.set_values and modified validation example lwru2.py to illustrate the advantages that can be gained from supervised caching.

File:

• inundation/pyvolution/quantity.py (modified) (9 diffs)

inundation/pyvolution/quantity.py

@@ -91 +91 @@
                    location = 'vertices',                   
                    indices = None,
-                   verbose = None):
+                   verbose = None,
+                   use_cache = False):
         
         """Set values for quantity based on different sources.
@@ -155 +156 @@
                   will be left undefined.
 
+        verbose: True means that output to stdout is generated
+
+        use_cache: True means that caching of intermediate results is
+                   attempted for least squares fit.
+                   
+                   
+        
 
         Exactly one of the arguments
@@ -211 +219 @@
             assert values is not None, msg
             self.set_values_from_points(points, values, alpha,
-                                        location, indices, verbose)
+                                        location, indices, verbose,
+                                        use_cache)
         elif filename is not None:
             self.set_values_from_file(filename, attribute_name, alpha,
-                                      location, indices, verbose)
+                                      location, indices, verbose,
+                                      use_cache)
         else:
             raise 'This can\'t happen :-)'
@@ -437 +447 @@
 
     def set_values_from_points(self, points, values, alpha,
-                               location, indices, verbose):
-        """
-        """
-
-        
-        #FIXME: Needs unit test         
+                               location, indices, verbose, use_cache):
+        """Set quantity values from arbitray data points using least squares
+        """
+
+        from Numeric import Float 
         from util import ensure_numeric
         from least_squares import fit_to_mesh
@@ -457 +466 @@
         triangles = self.domain.triangles
 
-        #FIXME Pass and use caching here
-        vertex_attributes = fit_to_mesh(coordinates,
-                                        triangles,
-                                        points,
-                                        values,
-                                        alpha = alpha,
-                                        verbose = verbose)
+        if use_cache is True:
+            try:
+                from caching import cache
+            except:
+                msg = 'Caching was requested, but caching module'+\
+                      'could not be imported'
+                raise msg
+            
+            args = (coordinates, triangles, points, values)
+            kwargs = {'alpha': alpha, 'verbose': verbose}
+            vertex_attributes = cache(fit_to_mesh,
+                                      args, kwargs,
+                                      verbose = verbose)
+        else:    
+            vertex_attributes = fit_to_mesh(coordinates,
+                                            triangles,
+                                            points,
+                                            values,
+                                            alpha = alpha,
+                                            verbose = verbose)
+            
         
         self.set_values_from_array(vertex_attributes,
@@ -473 +496 @@
     
     def set_values_from_file(self, filename, attribute_name, alpha,
-                             location, indices, verbose):
+                             location, indices, verbose, use_cache):
         """Set quantity based on arbitrary points in .pts file
         using least_squares attribute_name selects name of attribute
@@ -481 +504 @@
 
 
-        #FIXME: Needs unit test 
         from types import StringType
         msg = 'Filename must be a text string'
@@ -513 +535 @@
         #Call least squares method    
         self.set_values_from_points(points, z, alpha,
-                                    location, indices, verbose)
+                                    location, indices, verbose, use_cache)
 
 
@@ -523 +545 @@
         location: Where values are to be stored.
                   Permissible options are: vertices, edges, centroid
-                  Default is "vertices"
+                  and unique vertices. Default is 'vertices'
 
         In case of location == 'centroids' the dimension values must