Changeset 406

Timestamp:

Oct 15, 2004, 9:54:37 AM (20 years ago)

Author:

duncan

Message:

added a test (ungen), fixed typo

File:

• inundation/ga/storm_surge/pmesh/meshHarness.py (modified) (2 diffs)

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -620 +620 @@
         #print "****************** fileName", fileName
         m.exportASCIItrianglulationfile(fileName)
-        print "******************"
-        print "m", m
-        print "******************"
+        #print "******************"
+        #print "m", m
+        #print "******************"
         m_returned = importMeshFromFile(fileName)
-        print "m_returned",m_returned
-        print "******************"
+        #print "m_returned",m_returned
+        #print "******************"
         #print "****************** fileName", fileName
         os.remove(fileName)
@@ -838 +838 @@
         #    self.failUnless(userVert.y == inputVert.y,
         #                    'y duplicate verts not removed')
+
+
+    def test_removeDuplicatedVertices(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\
+       10.0       10.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)
+        m.addVertsSegs(dict)
+            
+        self.failUnless(len(m.userSegments) ==11,
+                        'Segments not deleted.')
+        self.failUnless(len(m.userVertices) == 11,
+                        'Vertex deleted, instead of segment.')
+        self.failUnless(m.userSegments[10].vertices[0] == m.userVertices[10],
+                        'Vertex deleted, instead of segment.')
+        self.failUnless(m.userSegments[10].vertices[1] == m.userVertices[8],
+                        'Vertex deleted, instead of segment.')
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(meshTestCase,'teszt')
+    suite = unittest.makeSuite(meshTestCase,'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)