Changeset 5868

Timestamp:

Oct 27, 2008, 5:55:58 PM (16 years ago)

Author:

ole

Message:

Added memory caching option for interpolation points.

Location:

anuga_core/source/anuga

Files:

• culvert_flows/Test_Culvert_Flat_Water_Lev.py (modified) (1 diff)
• fit_interpolate/interpolate.py (modified) (6 diffs)

anuga_core/source/anuga/culvert_flows/Test_Culvert_Flat_Water_Lev.py

@@ -165 +165 @@
     
     
-import sys; sys.exit() 
+#import sys; sys.exit() 
 # Profiling code
 import time

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -109 +109 @@
     
     """
-    
+
+    # FIXME(Ole): Probably obsolete since I is precomputed and interpolate_block caches
+        
     from anuga.caching import cache
     
@@ -175 +177 @@
         
         # Initialise variabels
-        self._A_can_be_reused = False
-        self._point_coordinates = None
+        self._A_can_be_reused = False  # FIXME (Ole): Probably obsolete
+        self._point_coordinates = None # FIXME (Ole): Probably obsolete
+        self.interpolation_matrices = {} # Store precomputed matrices
         
         FitInterpolate.__init__(self,
@@ -301 +304 @@
         # This really should use some kind of caching in cases where
         # interpolation points are reused.
+        #
+        # This has now been addressed through an attempt in interpolate_block
 
         #print "point_coordinates interpolate.interpolate", point_coordinates
@@ -373 +378 @@
         See interpolate for doc info.
         """
+        
+        # FIXME (Ole): I reckon we should change the interface so that
+        # the user can specify the interpolation matrix instead of the 
+        # interpolation points to save time.
+        
+        
         if isinstance(point_coordinates, Geospatial_data):
             point_coordinates = point_coordinates.get_data_points(\
@@ -379 +390 @@
         # Convert lists to Numeric arrays if necessary
         point_coordinates = ensure_numeric(point_coordinates, Float)
-        f = ensure_numeric(f, Float)        
-
-        import sys
-        if use_cache is True and sys.platform != 'win32':
-            # FIXME (Ole): (Why doesn't this work on windoze?)
-            
-            X = cache(self._build_interpolation_matrix_A,
-                      args=(point_coordinates,),
-                      kwargs={'verbose': verbose},                        
-                      verbose=verbose)        
-        else:
+        f = ensure_numeric(f, Float)                
+
+        
+        # Hash point_coordinates to memory location and reuse if possible
+        from anuga.caching import myhash
+        from Numeric import alltrue
+        
+
+        key = myhash(point_coordinates)
+        
+        reuse_A = False        
+        if self.interpolation_matrices.has_key(key):
+            X, stored_points = self.interpolation_matrices[key] 
+            if alltrue(stored_points == point_coordinates):
+                reuse_A = True # Reuse interpolation matrix
+                
+        if reuse_A is False:
             X = self._build_interpolation_matrix_A(point_coordinates,
-                                                   verbose=verbose)    
+                                                   verbose=verbose)
+            self.interpolation_matrices[key] = (X, point_coordinates)
+                                                       
         
         # Unpack result                                       
@@ -412 +431 @@
         assert self._A.shape[1] == f.shape[0], msg
 
+        
         # Compute Matrix vector product and return
         return self._get_point_data_z(f)