Changeset 5869

Timestamp:

Oct 27, 2008, 6:10:13 PM (15 years ago)

Author:

ole

Message:

Better caching of interpolation information. This one should also work on Win32.

File:

• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (1 diff)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -392 +392 @@
         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
+        import sys
+        if use_cache is True:
+            if sys.platform != 'win32':
+                # FIXME (Ole): (Why doesn't this work on windoze?)
+                # Still absolutele fails on Win 24 Oct 2008
+            
+                X = cache(self._build_interpolation_matrix_A,
+                          args=(point_coordinates,),
+                          kwargs={'verbose': verbose},                        
+                          verbose=verbose)        
+            else:
+                # Hash point_coordinates to memory location and reuse if possible
+                # This will work on Linux as well if we want to use it there. (FIXME)
+                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:
+                if reuse_A is False:
+                    X = self._build_interpolation_matrix_A(point_coordinates,
+                                                           verbose=verbose)
+                    self.interpolation_matrices[key] = (X, point_coordinates)
+        else:
             X = self._build_interpolation_matrix_A(point_coordinates,
-                                                   verbose=verbose)
-            self.interpolation_matrices[key] = (X, point_coordinates)
+                                                   verbose=verbose)