Changeset 5207

Timestamp:

Apr 11, 2008, 4:18:26 PM (16 years ago)

Author:

duncan

Message:

Adding regional tags when importing polygons

Location:

anuga_core

Files:

• documentation/user_manual/anuga_user_manual.tex (modified) (1 diff)
• source/anuga/pmesh/mesh.py (modified) (11 diffs)
• source/anuga/pmesh/test_mesh.py (modified) (5 diffs)

anuga_core/documentation/user_manual/anuga_user_manual.tex

@@ -1704 +1704 @@
 
 
-\begin{methoddesc}  {import_ungenerate_file}{self,ofile, tag=None}
+\begin{methoddesc}  {import_ungenerate_file}{self,ofile, tag=None, 
+region_tag=None}
 Module: \module{pmesh.mesh},  Class: \class{Mesh}
 
-This method is used to import a polygon file in the ungenerate
-format, which is used by arcGIS. The polygons from the file are converted to
+This method is used to import a polygon file in the ungenerate format,
+which is used by arcGIS. The polygons from the file are converted to
 vertices and segments. \code{ofile} is the name of the polygon file.
 \code{tag} is the tag given to all the polygon's segments.
+\code{region_tag} is the tag given to all the polygon's segments.  If
+it is a string the one value will be assigned to all regions.  If it
+is a list the first value in the list will be applied to the first
+polygon etc.
 
 This function can be used to import building footprints.

anuga_core/source/anuga/pmesh/mesh.py

@@ -583 +583 @@
         return h
    
-    def add_region(self, x,y, geo_reference=None):
+    def add_region(self, x,y, geo_reference=None, tag=None):
         """
         adds a point, which represents a region.
@@ -594 +594 @@
         [[x,y]] = self.geo_reference.change_points_geo_ref([x,y],
                                                  points_geo_ref=geo_reference)
-        return self._addRegion(x, y)
+        region =  self._addRegion(x, y)
+        if tag is not None:
+            region.setTag(tag)
+        return region
 
     def build_grid(self,  vert_rows, vert_columns):
@@ -680 +683 @@
         so if the user whats to modify it they can.     
         """
-        if max_triangle_area is None:
+        if max_triangle_area is None and region_tag is None:
             create_region = False
         else:
@@ -779 +782 @@
         # Due to this default this method is too connected to
         # _add_area_from_polygon
-        
         segment_tags = ['']*number_of_segs
         if tags is not None:
@@ -1881 +1883 @@
 
 
-    def import_ungenerate_file(self,ofile, tag=None):
+    def import_ungenerate_file(self,ofile, tag=None, region_tag=None):
         """
         Imports an ungenerate file, from arcGIS into mesh.
 
         ofile is the name of the ungenerated file.
-        Tag is a string name to be taggged on each segment. 
+        Tag is a string name to be taggged on each segment.
+        
+        region_tag is the tag applied to the building regions.
+        if it is a string the one value will be assigned to all regions
+        if it is a list the first value in the list will be applied to the first polygon etc.
+        WARNING: size of list and number of polygons isn't checked 
 
         WARNING values are assumed to be absolute.
@@ -1896 +1903 @@
         if tag is not None:
             Segment.set_default_tag(str(tag))
-        self.addVertsSegs(dict)
+        
+        if region_tag is None:
+            self.addVertsSegs(dict)
+        else:           
+            if not isinstance(region_tag, list):
+                region_tag = [region_tag]*len(dict['polygons'])
+            for a_tag,polygon in map(None, region_tag, dict['polygons']): 
+                segment_tags = {tag:range(len(polygon))}
+                self.add_region_from_polygon(polygon,segment_tags=segment_tags,
+                                region_tag=a_tag)
+            
+        
         Segment.set_default_tag(default_tag)
 
-        # change the tag back to  it's default
+        # change the tag back to it's default
     
         
@@ -2164 +2182 @@
     last line:  "END"
     """
+    
     END_DELIMITER = 'END'
     
     points = []
     segments = []
+    polygons = []
     
     isEnd = False
     line = fd.readline() #not used <# of polynomial> <x> <y>
     while not isEnd:
+        poly = []
         line = fd.readline()
         fragments = line.split()
-        vert = [float(fragments.pop(0)),float(fragments.pop(0))]
-        points.append(vert)
+        x = float(fragments.pop(0))
+        y = float(fragments.pop(0))
+        points.append([x,y])
+        poly.append([x,y])
         PreviousVertIndex = len(points)-1
         firstVertIndex = PreviousVertIndex
@@ -2183 +2206 @@
             #print "line >" + line + "<"
             fragments = line.split()
-            vert = [float(fragments.pop(0)),float(fragments.pop(0))]
-            points.append(vert)
+            x = float(fragments.pop(0))
+            y = float(fragments.pop(0))
+            points.append([x,y])
+            poly.append([x,y])
             thisVertIndex = len(points)-1
             segment = [PreviousVertIndex,thisVertIndex]
@@ -2190 +2215 @@
             PreviousVertIndex = thisVertIndex
             line = fd.readline() #Read the next line
-            i =+ 1
         # If the last and first segments are the same,
         # Remove the last segment and the last vertex
@@ -2202 +2226 @@
             points.pop()
             segments.pop()
+            poly.pop()
             thisVertIndex = len(points)-1
-            segments.append([thisVertIndex, firstVertIndex])
+        segments.append([thisVertIndex, firstVertIndex])
         
         line = fd.readline() # read <# of polynomial> <x> <y> OR END
         #print "line >>" + line + "<<"
+        # do poly stuff here
+        polygons.append(poly)
         if line.startswith(END_DELIMITER):
             isEnd = True
@@ -2215 +2242 @@
     ungenerated_dict['points'] = points
     ungenerated_dict['segments'] = segments
+    ungenerated_dict['polygons'] = polygons
     return ungenerated_dict
 

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -1282 +1282 @@
                         'wrong tag.')
         
-    def test_ungenerateFileLoadingII(self):
+    def test_import_ungenerate_file(self):
         
         fileName = tempfile.mktemp(".txt")
         file = open(fileName,"w")
         file.write("         1       ??      ??\n\
-       0.0       0.0\n\
-       1.0       0.0\n\
-       1.0       1.0\n\
-       0.0       1.0\n\
-       0.0       0.0\n\
+       10.0       10.0\n\
+       11.0       10.0\n\
+       11.0       11.0\n\
+       10.0       11.0\n\
+       10.0       10.0\n\
 END\n\
          2      ?? ??\n\
-       10.0       10.0\n\
-       10.0       20.0\n\
        20.0       20.0\n\
+       20.0       30.0\n\
+       30.0       30.0\n\
 END\n\
 END\n")
@@ -1320 +1320 @@
         m.addVertsSegs(dict)
 
-        self.failUnless(len(m.userSegments) ==10,
+        self.failUnless(len(m.userSegments) ==11,
                         'Wrong segment list length.')
         self.failUnless(len(m.userVertices) == 11,
@@ -1340 +1340 @@
         initial_tag = "PIG"
         Segment.set_default_tag(initial_tag)
-        m.import_ungenerate_file(fileName, tag=tag)
+        m.import_ungenerate_file(fileName, tag=tag, region_tag="swamp")
 
         os.remove(fileName)
@@ -1346 +1346 @@
         self.failUnless(Segment.get_default_tag() == initial_tag,
                         'Wrong segment list length.')
-        
-        
-        self.failUnless(len(m.userSegments) ==10,
+        m.export_mesh_file("swamp.tsh")
+        #print "m.userSegments",m.userSegments
+        self.failUnless(len(m.userSegments) ==11,
                         'Wrong segment list length.')
         self.failUnless(len(m.userVertices) == 11,
                         'Wrong vertex list length.')
+        self.failUnless(len(m.regions) == 2,
+                        'Wrong regions list length.')
+        self.failUnless(m.regions[0].getTag() == "swamp",
+                        'Wrong regions tag.')
+        self.failUnless(m.regions[1].getTag() == "swamp",
+                        'Wrong regions 1 tag.')
+        
+        # have to reset this , since it's a class attribute
+        Segment.set_default_tag("")
+        
+        
+    def test_import_ungenerate_file_different_region_tags(self):
+        
+        fileName = tempfile.mktemp(".txt")
+        file = open(fileName,"w")
+        file.write("         1       ??      ??\n\
+       10.0       10.0\n\
+       11.0       10.0\n\
+       11.0       11.0\n\
+       10.0       11.0\n\
+       10.0       10.0\n\
+END\n\
+         2      ?? ??\n\
+       20.0       20.0\n\
+       20.0       30.0\n\
+       30.0       30.0\n\
+END\n\
+END\n")
+        file.close()
+        
+        
+        a = Vertex (0.0, 0.0) #, attributes = [1.1])
+        b = Vertex (0.0, 40.0) #, attributes = [1.2])
+        c = Vertex (40.0,40.0) #, attributes = [1.3])
+        d = Vertex (40.0,0.0) #, attributes = [1.4])
+    
+        s1 = Segment(a,b)
+        s2 = Segment(b,c)
+        s3 = Segment(c,d)
+        s4 = Segment(d,a)
+     
+        m = Mesh(userVertices=[a,b,c,d], userSegments=[s1,s2,s3,s4])
+        dict = importUngenerateFile(fileName)
+        #os.remove(fileName)
+
+        tag = "DSG"
+        Segment.set_default_tag(tag)
+        m.addVertsSegs(dict)
+
+        self.failUnless(len(m.userSegments) ==11,
+                        'Wrong segment list length.')
+        self.failUnless(len(m.userVertices) == 11,
+                        'Wrong vertex list length.')
+
+        # Test the method
+        a = Vertex (0.0, 0.0) #, attributes = [1.1])
+        b = Vertex (0.0, 40.0) #, attributes = [1.2])
+        c = Vertex (40.0,40.0) #, attributes = [1.3])
+        d = Vertex (40.0,0.0) #, attributes = [1.4])
+    
+        s1 = Segment(a,b)
+        s2 = Segment(b,c)
+        s3 = Segment(c,d)
+        s4 = Segment(d,a)
+     
+        m = Mesh(userVertices=[a,b,c,d], userSegments=[s1,s2,s3,s4])
+        tag = "DSG"        
+        initial_tag = "PIG"
+        Segment.set_default_tag(initial_tag)
+        m.import_ungenerate_file(fileName, tag=tag, region_tag=["swamp","coastalp"])
+
+        os.remove(fileName)
+
+        self.failUnless(Segment.get_default_tag() == initial_tag,
+                        'Wrong segment list length.')
+        m.export_mesh_file("swamp.tsh")
+        #print "m.userSegments",m.userSegments
+        self.failUnless(len(m.userSegments) ==11,
+                        'Wrong segment list length.')
+        self.failUnless(len(m.userVertices) == 11,
+                        'Wrong vertex list length.')
+        self.failUnless(len(m.regions) == 2,
+                        'Wrong regions list length.')
+        self.failUnless(m.regions[0].getTag() == "swamp",
+                        'Wrong regions tag.')
+        self.failUnless(m.regions[1].getTag() == "coastalp",
+                        'Wrong regions 1 tag.')
+        
         
         # have to reset this , since it's a class attribute
@@ -2199 +2287 @@
     #suite = unittest.makeSuite(meshTestCase,'test_asciiFile')
     #suite = unittest.makeSuite(meshTestCase,'test_mesh2IO')
-    #suite = unittest.makeSuite(meshTestCase,'testgenerateMesh')
+    #suite = unittest.makeSuite(meshTestCase,'test_import_ungenerate_file')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)