Changeset 1421 for inundation/ga/storm_surge/pmesh/mesh.py

Timestamp:

May 18, 2005, 4:19:43 PM (19 years ago)

Author:

duncan

Message:

speed up the drawing of alpha boundaries

File:

• inundation/ga/storm_surge/pmesh/mesh.py (modified) (3 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -811 +811 @@
         return len(identicalSegs) == 0
 
-    def representedAlphaUserSegment(self, v1,v2):
-        identicalSegs= [x for x in self.alphaUserSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
-
-        if identicalSegs == []:
-            return None
-        else:
-            # Only return the first one.
-            return identicalSegs[0]
-    
-    def representedUserSegment(self, v1,v2):
-        identicalSegs= [x for x in self.userSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
-
-        if identicalSegs == []:
-            return None
-        else:
-            # Only return the first one.
-            return identicalSegs[0]
         
     def deleteSegsOfVertex(self, delVertex):
@@ -1307 +1290 @@
         self.shape = alpha_shape.alpha_shape.Alpha_Shape(points, alpha = alpha)
 
+
     def _boundary2mesh(self, raw_boundary=True,
+                    remove_holes=False,
+                    smooth_indents=False,
+                    expand_pinch=False):
+        """
+        Precon there must be a shape object.
+        """
+        self.shape.set_boundary_type(raw_boundary=raw_boundary,
+                                 remove_holes=remove_holes,
+                                 smooth_indents=smooth_indents,
+                                 expand_pinch=expand_pinch)
+        boundary_segs = self.shape.get_boundary()
+        #print "boundary_segs",boundary_segs
+        segs2delete = self.alphaUserSegments
+        #FIXME(DSG-DSG) this algorithm needs comments
+        #FIXME(DSG-DSG) can it be sped up?  It's slow
+        new_segs = {}
+        #alpha_segs = []
+        #user_segs = []
+        for seg in boundary_segs:
+            v1 = self.userVertices[int(seg[0])]
+            v2 = self.userVertices[int(seg[1])]
+            boundary_seg = Segment(v1, v2)
+            new_segs[(v1,v2)] = boundary_seg
+
+        for user_seg in self.userSegments:
+            if new_segs.has_key((user_seg.vertices[0],
+                                user_seg.vertices[1])):
+                del new_segs[user_seg.vertices[0],
+                                user_seg.vertices[1]]
+            elif new_segs.has_key((user_seg.vertices[1],
+                                user_seg.vertices[0])):
+                del new_segs[user_seg.vertices[1],
+                                user_seg.vertices[0]]
+                
+        optimum_alpha = self.shape.get_alpha()
+        alpha_segs_no_user_segs  = new_segs.values()
+        self.alphaUserSegments = alpha_segs_no_user_segs
+        return alpha_segs_no_user_segs, segs2delete, optimum_alpha
+    
+    def _boundary2mesh_old(self, raw_boundary=True,
                     remove_holes=False,
                     smooth_indents=False,
@@ -1355 +1379 @@
         # need to draw newsegs
         return new_segs, segs2delete, optimum_alpha
-     
+    
+    def representedAlphaUserSegment(self, v1,v2):
+        identicalSegs= [x for x in self.alphaUserSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
+
+        if identicalSegs == []:
+            return None
+        else:
+            # Only return the first one.
+            return identicalSegs[0]
+    
+    def representedUserSegment(self, v1,v2):
+        identicalSegs= [x for x in self.userSegments if (x.vertices[0] == v1 and x.vertices[1] == v2) or (x.vertices[0] == v2 and x.vertices[1] == v1) ]
+
+        if identicalSegs == []:
+            return None
+        else:
+            # Only return the first one.
+            return identicalSegs[0]
+        
     def joinVertices(self):
         """