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

Timestamp:

Oct 10, 2006, 12:10:07 PM (18 years ago)

Author:

ole

Message:

Fixed ticket:95

File:

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

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -476 +476 @@
 
 
-    def no_test_clip1_inside_outside(self):
+    def test_clip1_inside_outside(self):
         """test_clip1_inside_outside(self):
         
@@ -487 +487 @@
         points = [[-1, 4], [0.2, 0.5], [1.0, 2.1], [0.4, 0.3], [3.0, 5.3],
                   [0, 0], [2.4, 3.3]]
+
         G = Geospatial_data(points)
 
@@ -492 +493 @@
         U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
         G1 = G.clip(U)
+        assert allclose(G1.get_data_points(),[[0.2, 0.5], [0.4, 0.3], [0, 0]])
+        
         G2 = G.clip_outside(U)
-
-        assert allclose((G1+G2).get_data_points(),points)
+        assert allclose(G2.get_data_points(),[[-1, 4], [1.0, 2.1],
+                                              [3.0, 5.3], [2.4, 3.3]])
+
+        
+        # New ordering
+        new_points = [[0.2, 0.5], [0.4, 0.3], [0, 0]] +\
+                     [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]]
+        
+        assert allclose((G1+G2).get_data_points(), new_points)
+        
 
     def test_create_from_xya_file(self):