Changeset 5951 for anuga_core/source_numpy_conversion/anuga/load_mesh

Timestamp:

Nov 12, 2008, 3:16:51 PM (16 years ago)

Author:

rwilson

Message:

More NumPy? changes.

File:

• anuga_core/source_numpy_conversion/anuga/load_mesh/test_loadASCII.py (modified) (1 diff)

anuga_core/source_numpy_conversion/anuga/load_mesh/test_loadASCII.py

@@ -179 +179 @@
         #print "*(*("
         
-        self.failUnless(numpy.array(meshDict['vertices'])  ==
-                        numpy.array(loadedDict['vertices']),
-                         'test_export_mesh_file failed. Test 1')
-        self.failUnless(numpy.array(meshDict['triangles'])  ==
-                        numpy.array(loadedDict['triangles']),
-                         'test_export_mesh_file failed. Test 2')
-        self.failUnless(numpy.array(meshDict['segments'])  ==
-                        numpy.array(loadedDict['segments']),
-                         'test_export_mesh_file failed. Test 3')
-        self.failUnless(numpy.array(meshDict['triangle_tags'])  ==
-                        numpy.array(loadedDict['triangle_tags']),
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['vertices'])  ==
+                                      numpy.array(loadedDict['vertices'])
+                                     ),
+                        'test_export_mesh_file failed. Test 1')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['triangles'])  ==
+                                      numpy.array(loadedDict['triangles'])),
+                        'test_export_mesh_file failed. Test 2')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['segments'])  ==
+                                      numpy.array(loadedDict['segments'])
+                                     ),
+                        'test_export_mesh_file failed. Test 3')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['triangle_tags'])  ==
+                                      numpy.array(loadedDict['triangle_tags'])
+                                     ),
                          'test_export_mesh_file failed. Test 4')
         
         self.failUnless(meshDict['vertex_attributes']  ==
                         loadedDict['vertex_attributes'],
-                         'test_export_mesh_file failed. Test 5')
-        self.failUnless(numpy.array(meshDict['triangle_neighbors'])  ==
-                        numpy.array(loadedDict['triangle_neighbors']),
-                         'test_export_mesh_file failed. Test 6')
-        self.failUnless(numpy.array(meshDict['segment_tags'])  ==
-                        numpy.array(loadedDict['segment_tags']),
-                         'test_export_mesh_file failed. Test 7')
-        self.failUnless(numpy.array(meshDict['vertex_attribute_titles'])  ==
-                        numpy.array(loadedDict['vertex_attribute_titles']),
-                         'test_export_mesh_file failed. Test 8')
-        self.failUnless(numpy.array(meshDict['geo_reference'])  ==
-                        numpy.array(loadedDict['geo_reference']),
-                         'test_export_mesh_file failed. Test 9')
+                        'test_export_mesh_file failed. Test 5')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['triangle_neighbors'])  ==
+                                      numpy.array(loadedDict['triangle_neighbors'])
+                                     ),
+                        'test_export_mesh_file failed. Test 6')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['segment_tags'])  ==
+                                      numpy.array(loadedDict['segment_tags'])
+                                     ),
+                        'test_export_mesh_file failed. Test 7')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['vertex_attribute_titles'])  ==
+                                      numpy.array(loadedDict['vertex_attribute_titles'])
+                                     ),
+                        'test_export_mesh_file failed. Test 8')
+        self.failUnless(numpy.alltrue(numpy.array(meshDict['geo_reference'])  ==
+                                      numpy.array(loadedDict['geo_reference'])
+                                     ),
+                        'test_export_mesh_file failed. Test 9')
             
         os.remove(fileName)