Changeset 1159

Timestamp:

Mar 29, 2005, 4:26:39 PM (20 years ago)

Author:

prow

Message:

tri2polyset - weeding duplicate verities

Location:

inundation/ga/storm_surge/pmesh

Files:

• mesh.py (modified) (2 diffs)
• pmesh.py (modified) (1 diff)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -2119 +2119 @@
 
 
+    def weed(self):
+        #FIXME - for backwards compatibility.
+        #weed out existing duplicates
+        print 'len(self.getUserSegments())'
+        print len(self.getUserSegments())
+        print 'len(self.getUserVertices())'
+        print len(self.getUserVertices())
+
+        point_keys = {}
+        for vertex in self.getUserVertices():
+            point = (vertex.x,vertex.y)
+            if point_keys.has_key(point):
+                self.userVertices.remove(vertex)
+            else: point_keys[point]=vertex
+
+        line_keys = {}
+        for segment in self.getUserSegments():
+            vertex1 = segment.vertices[0]
+            vertex2 = segment.vertices[1]
+            point1 = (vertex1.x,vertex1.y)
+            point2 = (vertex2.x,vertex2.y)
+            segment.vertices[0]=point_keys[point1]
+            segment.vertices[1]=point_keys[point2]
+            line1 = (point1,point2)
+            line2 = (point2,point1)
+            if line_keys.has_key(line1) or line_keys.has_key(line2):
+                self.userSegments.remove(segment)
+            else: line_keys[line1]=None
+        #end backward-compatibility stuff
+
     def triangles_to_polySet(self,setName):
-
+        ##
+        #self.weed()#FIXME for back-compatibilty - delete sometime
+        ##
+
+
+        #build a set of existing segments
+        line_keys = {}
+        for segment in self.getUserSegments():
+            vertex1 = segment.vertices[0]
+            vertex2 = segment.vertices[1]
+            line = ((vertex1.x,vertex1.y),(vertex2.x,vertex2.y))
+            line_keys[line]=None
+
+        #build a set of existing vertexes
+        point_keys = {}
+        for vertex in self.getUserVertices():
+            point = (vertex.x,vertex.y)
+            point_keys[point]=vertex
+
+        #turn the triangles into a set
         Triangles = self.sets[self.setID[setName]]
         Triangles_dict = {}
@@ -2131 +2180 @@
         for triangle in Triangles:
             for i in (0,1,2):
+                #for every triangles neighbour:
+
                 if not Triangles_dict.has_key(triangle.neighbors[i]):
+                #if the neighbour is not in the set:
                     a = triangle.vertices[i-1]
                     b = triangle.vertices[i-2]
-                    userVertices[a]=0
-                    userVertices[b]=0
-                    userSegments.append([a,b])
+                    if not point_keys.has_key((a.x,a.y)):
+                        #if point a does not already exist
+                        #then add it to the points.
+                        userVertices[a]=True
+                        point_keys[(a.x,a.y)]=a
+                    else: userVertices[a]=point_keys[(a.x,a.y)]
+                    assert userVertices.has_key(a)
+
+                    if not point_keys.has_key((b.x,b.y)):
+                        #if point b does not already exist
+                        #then add it to the points.
+                        userVertices[b]=True
+                        point_keys[(b.x,b.y)]=b
+                    else: userVertices[b]=point_keys[(b.x,b.y)]
+                    assert userVertices.has_key(b)  
+
+                    if not (line_keys.has_key(((a.x,a.y),(b.x,b.y)))\
+                         or line_keys.has_key(((b.x,b.y),(a.x,a.y)))):
+                        #if the segment does not already exist then
+                        #add it to the segments
+                        assert ((a.x,a.y)!=(b.x,b.y))
+                        assert a!=b
+                        userSegments.append((a,b))
+                        line_keys[((a.x,a.y),(b.x,b.y))]=None
+
         return userVertices, userSegments
 

inundation/ga/storm_surge/pmesh/pmesh.py

@@ -342 +342 @@
         event = None
         for v in vertices.keys():
-            x = v.x*self.SCALE
-            y = v.y*self.SCALE
-            vertices[v]=self.drawVertex(x,y,event)
+            if vertices[v] is True:
+                x = v.x*self.SCALE
+                y = v.y*self.SCALE
+                vertices[v]=self.drawVertex(x,y,event)
+        print 'segments'
+        print segments
+        print 'vertices.keys()'
+        print vertices.keys()
         for s in segments:
             v0 = vertices[s[0]]