Changeset 4484

Timestamp:

May 24, 2007, 4:15:34 PM (18 years ago)

Author:

ole

Message:

Made Geospatial addition absolute together with Nick to save alot of memory.
We hope this won't cause any hassles but all tests pass.

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (3 diffs)
• test_geospatial_data.py (modified) (2 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -412 +412 @@
         attributes  
         
-        Always return relative points!
+        Always return absolute points!
         """
 
@@ -428 +428 @@
         # FIXME (Duncan and Ole): use lower left corner derived from
         # absolute coordinates
-        if self.geo_reference.xllcorner <= other.geo_reference.xllcorner:
-            xll = self.geo_reference.xllcorner
-        else:
-            xll = other.geo_reference.xllcorner
-
-        if self.geo_reference.yllcorner <= other.geo_reference.yllcorner:
-            yll = self.geo_reference.yllcorner
-        else:
-            yll = other.geo_reference.yllcorner
-        new_geo_ref = Geo_reference(geo_ref1.get_zone(), xll, yll)
-
-        xll = yll = 0. 
-        
-        relative_points1 = self.get_data_points(absolute = False)
-        relative_points2 = other.get_data_points(absolute = False)
-
-        
-        new_relative_points1 = new_geo_ref.\
-                               change_points_geo_ref(relative_points1,
-                                                     geo_ref1)
-        new_relative_points2 = new_geo_ref.\
-                               change_points_geo_ref(relative_points2,
-                                                     geo_ref2)
-        
-        # Now both point sets are relative to new_geo_ref and
-        # zones have been reconciled
-
-        # Concatenate points
-        new_points = concatenate((new_relative_points1,
-                                  new_relative_points2),
-                                  axis = 0)
+        #if self.geo_reference.xllcorner <= other.geo_reference.xllcorner:
+        #    xll = self.geo_reference.xllcorner
+        #else:
+        #    xll = other.geo_reference.xllcorner
+
+        #if self.geo_reference.yllcorner <= other.geo_reference.yllcorner:
+        #    yll = self.geo_reference.yllcorner
+        #else:
+        #    yll = other.geo_reference.yllcorner
+            
+        #new_geo_ref = Geo_reference(geo_ref1.get_zone(), xll, yll)
+
+        #xll = yll = 0. 
+        
+#         relative_points1 = self.get_data_points(absolute = False)
+#         relative_points2 = other.get_data_points(absolute = False)
+
+        
+#         relative_points1 = new_geo_ref.\
+#                            change_points_geo_ref(relative_points1,
+#                                                  geo_ref1)
+#         relative_points2 = new_geo_ref.\
+#                            change_points_geo_ref(relative_points2,
+#                                                  geo_ref2)
+        
+#         # Now both point sets are relative to new_geo_ref and
+#         # zones have been reconciled
+
+#         # Concatenate points
+#         new_points = concatenate((relative_points1,
+#                                   relative_points2),
+#                                   axis = 0)
+        
+        new_points = concatenate((self.get_data_points(absolute = True),
+                                  other.get_data_points(absolute = True)),
+                                  axis = 0)        
+
+        
       
         # Concatenate attributes if any
@@ -482 +489 @@
                     raise Exception, msg
 
-        # Instantiate new data object and return    
+        # Instantiate new data object and return absolute coordinates
+        new_geo_ref = Geo_reference(geo_ref1.get_zone(), 0.0, 0.0)
         return Geospatial_data(new_points,
                                new_attributes,

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -371 +371 @@
         
         G = G1 + G2
-        
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.1)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 2.0)
+
+        # Check absoluteness
+        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
 
         P = G.get_data_points(absolute=True)
 
-        P_relative = G.get_data_points(absolute=False)
-        
-        assert allclose(P_relative, P - [0.1, 2.0])
+        #P_relative = G.get_data_points(absolute=False)
+        #
+        #assert allclose(P_relative, P - [0.1, 2.0])
 
         assert allclose(P, concatenate( (P1,P2) ))
@@ -423 +424 @@
         G = G1 + G2
         
-        assert allclose(G.get_geo_reference().get_xllcorner(), 1.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 2.0)
+        #assert allclose(G.get_geo_reference().get_xllcorner(), 1.0)
+        #assert allclose(G.get_geo_reference().get_yllcorner(), 2.0)
 
         P = G.get_data_points(absolute=True)
 
-        P_relative = G.get_data_points(absolute=False)
-        
-        assert allclose(P_relative, [[1.0, 2.1], [3.0, 5.3], [4.1, 7.1], [5.1, 4.3]])
+        #P_relative = G.get_data_points(absolute=False)
+        #
+        #assert allclose(P_relative, [[1.0, 2.1], [3.0, 5.3], [4.1, 7.1], [5.1, 4.3]])
 
         assert allclose(P, concatenate( (points1,points2) ))