Changeset 4484 for anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

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.

File:

• anuga_core/source/anuga/geospatial_data/test_geospatial_data.py (modified) (2 diffs)

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) ))