Changeset 431

Timestamp:

Oct 20, 2004, 3:15:06 PM (20 years ago)

Author:

duncan

Message:

increased functionality of ungenerate

Location:

inundation/ga/storm_surge/pmesh

Files:

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

inundation/ga/storm_surge/pmesh/mesh.py

@@ -1568 +1568 @@
             vert = [float(fragments.pop(0)),float(fragments.pop(0))]
             points.append(vert)
-            ThisVertIndex = len(points)-1
-            segment = [PreviousVertIndex,ThisVertIndex]
+            thisVertIndex = len(points)-1
+            segment = [PreviousVertIndex,thisVertIndex]
             segments.append(segment)
-            PreviousVertIndex = ThisVertIndex
+            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
         # then add a segment from the second last vert to the 1st vert
-        points.pop()
-        segments.pop()
-        ThisVertIndex = len(points)-1
-        segments.append([ThisVertIndex, firstVertIndex])
+        thisVertIndex = len(points)-1
+        firstVert = points[firstVertIndex]
+        thisVert = points[thisVertIndex]
+        #print "firstVert",firstVert
+        #print "thisVert",thisVert
+        if (firstVert[0] == thisVert[0] and firstVert[1] == thisVert[1]):
+            points.pop()
+            segments.pop()
+            thisVertIndex = len(points)-1
+            segments.append([thisVertIndex, firstVertIndex])
         
         line = fd.readline() # read <# of polynomial> <x> <y> OR END

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -593 +593 @@
                         'same_x_y False failed')
 
-    def teszt_import_mesh(self):
+    def test_import_mesh(self):
         
         a_att = [5.0,2.0]
@@ -891 +891 @@
         self.failUnless(m.userSegments[10].marker == tag,
                         'wrong tag.')
+   
+    def test_ungenerateFileLoadingII(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\
+END\n\
+         2      ?? ??\n\
+       10.0       10.0\n\
+       10.0       20.0\n\
+       20.0       20.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)
+
+        tag = "DSG"
+        Segment.set_default_tag(tag)
+        m.addVertsSegs(dict)
+
+        # have to reset this , since it's a class attribute
+        Segment.set_default_tag("")
+            
+        self.failUnless(len(m.userSegments) ==10,
+                        'Wrong segment list length.')
+        self.failUnless(len(m.userVertices) == 11,
+                        'Wrong vertex list length.')
         
 #-------------------------------------------------------------