Changeset 6546

Timestamp:

Mar 18, 2009, 4:28:11 PM (14 years ago)

Author:

ole

Message:

Made is_absolute use a flag instead of re-evaluating.
This saved up to 50% of time spent in fitting.

Also, changed the way points are copied to be more intelligent.

Location:

anuga_core/source/anuga

Files:

• coordinate_transforms/geo_reference.py (modified) (7 diffs)
• geospatial_data/test_geospatial_data.py (modified) (1 diff)

anuga_core/source/anuga/coordinate_transforms/geo_reference.py

@@ -72 +72 @@
         if ASCIIFile is not None:
             self.read_ASCII(ASCIIFile, read_title=read_title)
+            
+        # Set flag for absolute points (used by get_absolute)    
+        self.absolute = num.allclose([self.xllcorner, self.yllcorner], 0)
+            
 
     def get_xllcorner(self):
@@ -200 +204 @@
             is_list = True
 
-        points = ensure_numeric(copy.copy(points), num.Float)
+        points = ensure_numeric(points, num.Float)
         
         if len(points.shape) == 1:
@@ -222 +226 @@
             # If georeferences are different
         
+            points = copy.copy(points) # Don't destroy input                    
             if not points_geo_ref is None:
                 # Convert points to absolute coordinates
@@ -242 +247 @@
         in question are absolute.
         """
-
-        return num.allclose([self.xllcorner, self.yllcorner], 0) 
-
+        
+        # FIXME(Ole): It is unfortunate that decision about whether points
+        # are absolute or not lies with the georeference object. Ross pointed this out.
+        # Moreover, this little function is responsible for a large fraction of the time
+        # using in data fitting (something in like 40 - 50%.
+        # This was due to the repeated calls to allclose.
+        # With the flag method fitting is much faster (18 Mar 2009).
+
+        
+        # FIXME(Ole): HACK to be able to reuse data already cached (18 Mar 2009). 
+        # Remove at some point
+        if not hasattr(self, 'absolute'):
+            self.absolute = num.allclose([self.xllcorner, self.yllcorner], 0)
+
+            
+        # Return absolute flag    
+        return self.absolute
         
     
@@ -253 +272 @@
         """
 
-        #if self.is_absolute():
-        #    return points
         is_list = False
         if type(points) == types.ListType:
             is_list = True
 
-        points = ensure_numeric(copy.copy(points), num.Float)
+        points = ensure_numeric(points, num.Float)
         if len(points.shape) == 1:
-            #One point has been passed
+            # One point has been passed
             msg = 'Single point must have two elements'
             if not len(points) == 2:
                 raise ShapeError, msg    
-                #points = reshape(points, (1,2))
 
 
@@ -276 +292 @@
         # Add geo ref to points
         if not self.is_absolute():
+            points = copy.copy(points) # Don't destroy input                    
             points[:,0] += self.xllcorner 
             points[:,1] += self.yllcorner
@@ -316 +333 @@
         # Subtract geo ref from points
         if not self.is_absolute():
+            points = copy.copy(points) # Don't destroy input                            
             points[:,0] -= self.xllcorner 
             points[:,1] -= self.yllcorner

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -1988 +1988 @@
 
     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_write_csv_attributes_lat_long')
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_find_optimal_smoothing_parameter')
+    suite = unittest.makeSuite(Test_Geospatial_data, 'test_find_optimal_smoothing_parameter')
     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_split1')
-    suite = unittest.makeSuite(Test_Geospatial_data, 'test')
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)