Changeset 2144 for inundation/pmesh

Timestamp:

Dec 14, 2005, 3:18:09 PM (19 years ago)

Author:

duncan

Message:

different ordering found in windows and linux with dict.value(). change test so order is not tested

Location:

inundation/pmesh

Files:

• mesh.py (modified) (1 diff)
• test_mesh.py (modified) (1 diff)

inundation/pmesh/mesh.py

@@ -1720 +1720 @@
             verts[seg.vertices[0]] = seg.vertices[0]
             verts[seg.vertices[1]] = seg.vertices[1]
-        #print "verts.values()",verts.values() 
         meshDict = self.Mesh2IOOutlineDict(userVertices=verts.values())
         load_mesh.loadASCII.export_mesh_file(ofile,meshDict)

inundation/pmesh/test_mesh.py

@@ -820 +820 @@
         self.failUnless(0 == m.__cmp__(m),
                         'test_exportASCIIsegmentoutlinefile:loading and saving of a mesh failed')
-        self.failUnless(0 == m.__cmp__(m_returned),
-                        'test_exportASCIIsegmentoutlinefile:loading and saving of a mesh failed')
+        # Having problems with this on linux.
+        #The ordering of the dictionary values wasn't the same as the windows
+        #returned value (verts.values())
+        #self.failUnless(0 == m.__cmp__(m_returned),
+        #                'test_exportASCIIsegmentoutlinefile:loading and saving of a mesh failed')
+        self.failUnless(len(m.userSegments) == len(m_returned.userSegments),
+                        'segmentoutlinefile:IO of a mesh failed')
+        for i in range(len(m.userSegments)):
+            self.failUnless(m.userSegments[i].vertices[0].x ==
+                            m_returned.userSegments[i].vertices[0].x,
+                        'loading and saving of a mesh outline fialed')
+            self.failUnless(m.userSegments[i].vertices[0].y ==
+                            m_returned.userSegments[i].vertices[0].y,
+                        'loading and saving of a mesh outline fialed')
+            self.failUnless(m.userSegments[i].vertices[1].x ==
+                            m_returned.userSegments[i].vertices[1].x,
+                        'loading and saving of a mesh outline fialed')
+            self.failUnless(m.userSegments[i].vertices[1].y ==
+                            m_returned.userSegments[i].vertices[1].y,
+                        'loading and saving of a mesh outline fialed')
+
  
     def test_exportASCIIsegmentoutlinefile2(self):