Changeset 3717

Timestamp:

Oct 9, 2006, 5:25:58 PM (16 years ago)

Author:

sexton

Message:

test to add two clipped datasets (to be added to TRAC)

File:

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

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -422 +422 @@
                         [[0.5, 0.5], [1, -0.5], [1.5, 0]])
 
-
     def test_clip0_outside(self):
-        """test_clip0(self):
+        """test_clip0_outside(self):
         
         Test that point sets can be clipped outside of a polygon
@@ -450 +449 @@
 
     def test_clip1_outside(self):
-            """test_clip1(self):
-            
-            Test that point sets can be clipped outside of a polygon given as
-            another Geospatial dataset
-            """
-            
-            from anuga.coordinate_transforms.geo_reference import Geo_reference
-            
-            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)
-
-            # First try the unit square    
-            U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
-            assert allclose(G.clip_outside(U).get_data_points(),
-                            [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
-
-            # Then a more complex polygon
-            points = [ [0.5, 1.4], [0.5, 0.5], [1, -0.5], [1.5, 0], [0.5, 1.5], [0.5, -0.5]]
-            G = Geospatial_data(points)
-            polygon = Geospatial_data([[0,0], [1,0], [0.5,-1], [2, -1], [2,1], [0,1]])
-            
-
-            assert allclose(G.clip_outside(polygon).get_data_points(),
-                            [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
-
-
+        """test_clip1_outside(self):
+        
+        Test that point sets can be clipped outside of a polygon given as
+        another Geospatial dataset
+        """
+        
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
+        
+        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)
+
+        # First try the unit square    
+        U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
+        assert allclose(G.clip_outside(U).get_data_points(),
+                        [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
+
+        # Then a more complex polygon
+        points = [ [0.5, 1.4], [0.5, 0.5], [1, -0.5], [1.5, 0], [0.5, 1.5], [0.5, -0.5]]
+        G = Geospatial_data(points)
+        polygon = Geospatial_data([[0,0], [1,0], [0.5,-1], [2, -1], [2,1], [0,1]])
+        
+
+        assert allclose(G.clip_outside(polygon).get_data_points(),
+                        [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
+
+
+    def no_test_clip1_inside_outside(self):
+        """test_clip1_inside_outside(self):
+        
+        Test that point sets can be clipped outside of a polygon given as
+        another Geospatial dataset
+        """
+        
+        from anuga.coordinate_transforms.geo_reference import Geo_reference
+        
+        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)
+
+        # First try the unit square    
+        U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
+        G1 = G.clip(U)
+        G2 = G.clip_outside(U)
+
+        assert allclose((G1+G2).get_data_points(),points)
 
     def test_create_from_xya_file(self):