Changeset 6410 for branches/numpy/anuga/geospatial_data/test_geospatial_data.py

Timestamp:

Feb 25, 2009, 9:37:22 AM (15 years ago)

Author:

rwilson

Message:

numpy changes.

File:

• branches/numpy/anuga/geospatial_data/test_geospatial_data.py (modified) (5 diffs)

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

@@ -207 +207 @@
         new_geo_ref = Geo_reference(56, x_p, y_p)
         G.set_geo_reference(new_geo_ref)
-        msg = ('points_ab=%s, but\nG.get_data_points(absolute=True)=%s'
+        msg = ('points_ab=\n%s\nbut G.get_data_points(absolute=True)=\n%s'
                % (str(points_ab), str(G.get_data_points(absolute=True))))
         assert num.allclose(points_ab, G.get_data_points(absolute=True)), msg
@@ -342 +342 @@
 
         assert num.allclose(P, num.concatenate( (P1,P2) ))
-        msg = 'P=%s' % str(P)
+        msg = ('P=\n%s\nshould be close to\n'
+               '[[2.0, 4.1], [4.0, 7.3],\n'
+               ' [5.1, 9.1], [6.1, 6.3]]'
+               % str(P))
         assert num.allclose(P, [[2.0, 4.1], [4.0, 7.3],
                                 [5.1, 9.1], [6.1, 6.3]]), msg
@@ -369 +372 @@
 
         P1 = G1.get_data_points(absolute=False)
-        msg = ('P1=%s, but\npoints1 - <...>=%s'
+        msg = ('P1=\n%s\nbut points1 - <...>=\n%s'
                % (str(P1),
                   str(points1 - [geo_ref1.get_xllcorner(),
@@ -439 +442 @@
         assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
         P = G.get_data_points(absolute=True)
-        msg = 'P=%s' % str(P)
+        msg = 'P=\n%s' % str(P)
         assert num.allclose(P, [[3.0, 6.1], [5.0, 9.3]]), msg
 
@@ -1022 +1025 @@
         os.remove(fileName)
 
-        msg = ('results.get_data_points()=%s, but\nG.get_data_points(True)=%s'
+        msg = ('results.get_data_points()=\n%s\nbut G.get_data_points(True)=\n%s'
                % (str(results.get_data_points()), str(G.get_data_points(True))))
         assert num.allclose(results.get_data_points(),