Changeset 2447

Timestamp:

Feb 24, 2006, 6:21:06 PM (19 years ago)

Author:

ole

Message:

Build in caching into least squares + comments

Location:

inundation

Files:

• load_mesh/loadASCII.py (modified) (1 diff)
• pyvolution/least_squares.py (modified) (5 diffs)
• pyvolution/quantity.py (modified) (1 diff)

inundation/load_mesh/loadASCII.py

@@ -989 +989 @@
     Note: will throw an IOError if it can't load the file.
     Catch these!
+
+    #FIXME (Ole): This function should really return a Geospatial_data object.    
     """
     

inundation/pyvolution/least_squares.py

@@ -127 +127 @@
 
     if verbose: print "points file loaded"
-    if verbose:print "fitting to mesh"
+    if verbose: print "fitting to mesh"
     f = fit_to_mesh(vertex_coordinates,
                     triangles,
@@ -156 +156 @@
 
     #FIXME (Ole): Remember to output mesh_origin as well
-    if verbose: print "exporting to file ",mesh_output_file
+    if verbose: print "exporting to file ", mesh_output_file
 
     try:
@@ -174 +174 @@
                 data_origin = None,
                 mesh_origin = None,
-                precrop = False):
+                precrop = False,
+                use_cache = False):
     """
     Fit a smooth surface to a triangulation,
@@ -202 +203 @@
     """
 
-
-    interp = Interpolation(vertex_coordinates,
-                           triangles,
-                           point_coordinates,
-                           alpha = alpha,
-                           verbose = verbose,
-                           expand_search = expand_search,
-                           data_origin = data_origin,
-                           mesh_origin = mesh_origin,
-                           precrop = precrop)
+    if use_cache is True:
+        from caching.caching import cache
+        interp = cache(_interpolation,
+                       (vertex_coordinates,
+                        triangles,
+                        point_coordinates),
+                       {'alpha': alpha,
+                        'verbose': verbose,
+                        'expand_search': expand_search,
+                        'data_origin': data_origin,
+                        'mesh_origin': mesh_origin,
+                        'precrop': precrop},
+                       verbose = verbose)        
+        
+    else:
+        interp = Interpolation(vertex_coordinates,
+                               triangles,
+                               point_coordinates,
+                               alpha = alpha,
+                               verbose = verbose,
+                               expand_search = expand_search,
+                               data_origin = data_origin,
+                               mesh_origin = mesh_origin,
+                               precrop = precrop)
 
     vertex_attributes = interp.fit_points(point_attributes, verbose = verbose)
@@ -272 +287 @@
     return vertex_coordinates, triangles, boundary, vertex_attributes
 
+
+def _interpolation(*args, **kwargs):
+    """Private function for use with caching. Reason is that classes
+    may change their byte code between runs which is annoying.
+    """
+    
+    return Interpolation(*args, **kwargs)
 
 

inundation/pyvolution/quantity.py

@@ -690 +690 @@
 
         #Read from (NetCDF) file
+        #FIXME (Ole): This function should really return a Geospatial_data object.
         points_dict = import_points_file(filename)
         points = points_dict['pointlist']