Do not divide RMS by 10000 when testing against tolerance.

mgiuca-google · mgiuca-google · commit 125d235d8dba · 2013-02-27T11:49:00.000+11:00
This was arbitrary and made no sense. Increased all tolerances by a factor of
10000. Note that some are ridiculously large (e.g., 200 out of 255).
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -314,7 +314,7 @@ def compare_images( expected, actual, tol, in_decorator=False ):
 
    diff_image = make_test_filename(actual, 'failed-diff')
 
-   if ( (rms / 10000.0) <= tol ):
+   if rms <= tol:
       if os.path.exists(diff_image):
          os.unlink(diff_image)
       return None
@@ -347,7 +347,7 @@ def compare_images( expected, actual, tol, in_decorator=False ):
    else:
       # old-style call from mplTest directory
       msg = "  Error: Image files did not match.\n"       \
-            "  RMS Value: " + str( rms / 10000.0 ) + "\n" \
+            "  RMS Value: " + str( rms ) + "\n" \
             "  Expected:\n    " + str( expected ) + "\n"  \
             "  Actual:\n    " + str( actual ) + "\n"      \
             "  Difference:\n    " + str( diff_image ) + "\n"      \
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -165,7 +165,7 @@ def do_test():
 
                 yield (do_test,)
 
-def image_comparison(baseline_images=None, extensions=None, tol=1e-3,
+def image_comparison(baseline_images=None, extensions=None, tol=10,
                      freetype_version=None, remove_text=False,
                      savefig_kwarg=None):
     """
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -501,7 +501,7 @@ def test_imshow():
 
     ax.imshow(r)
 
-@image_comparison(baseline_images=['imshow_clip'], tol=1e-2)
+@image_comparison(baseline_images=['imshow_clip'], tol=100)
 def test_imshow_clip():
     # As originally reported by Gellule Xg <gellule.xg@free.fr>
 
@@ -543,7 +543,7 @@ def test_polycollection_joinstyle():
     ax.set_ybound(0, 3)
 
 @image_comparison(baseline_images=['fill_between_interpolate'],
-                  tol=1e-2, remove_text=True)
+                  tol=100, remove_text=True)
 def test_fill_between_interpolate():
     x = np.arange(0.0, 2, 0.02)
     y1 = np.sin(2*np.pi*x)
@@ -612,7 +612,7 @@ def test_symlog2():
     ax.grid(True)
     ax.set_ylim(-0.1, 0.1)
 
-@image_comparison(baseline_images=['pcolormesh'], tol=0.02,
+@image_comparison(baseline_images=['pcolormesh'], tol=200,
                   remove_text=True)
 def test_pcolormesh():
     n = 12
diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
@@ -57,7 +57,7 @@ def compare_figure(fname):
 
     expected = os.path.join(result_dir, "expected_%s" % fname)
     shutil.copyfile(os.path.join(baseline_dir, fname), expected)
-    err = compare_images(expected, actual, tol=5e-3)
+    err = compare_images(expected, actual, tol=50)
     if err:
         raise ImageComparisonFailure('images not close: %s vs. %s' % (actual, expected))
 
diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py
@@ -41,7 +41,7 @@ def test_image_compare_basic():
     # a small RMS.
     im1 = 'cosine_peak-nn-img.png'
     im2 = 'cosine_peak-nn-img-minorchange.png'
-    image_comparison_expect_rms(im1, im2, tol=1e-3, expect_rms=None)
+    image_comparison_expect_rms(im1, im2, tol=10, expect_rms=None)
 
     # Now test with no tolerance.
     image_comparison_expect_rms(im1, im2, tol=0, expect_rms=2.99949)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -56,7 +56,7 @@ def test_interp_nearest_vs_none():
     ax2.set_title('interpolation nearest')
 
 
-@image_comparison(baseline_images=['figimage-0', 'figimage-1'], extensions=['png'], tol=1.5e-3)
+@image_comparison(baseline_images=['figimage-0', 'figimage-1'], extensions=['png'], tol=15)
 def test_figimage():
     'test the figimage method'
 
@@ -159,7 +159,7 @@ def test_image_clip():
 
     im = ax.imshow(d, extent=(-pi,pi,-pi/2,pi/2))
 
-@image_comparison(baseline_images=['imshow'], tol=1.5e-3, remove_text=True)
+@image_comparison(baseline_images=['imshow'], tol=15, remove_text=True)
 def test_imshow():
     import numpy as np
     import matplotlib.pyplot as plt
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -4,7 +4,7 @@
 import matplotlib.pyplot as plt
 import matplotlib as mpl
 
-@image_comparison(baseline_images=['legend_auto1'], tol=1.5e-3, remove_text=True)
+@image_comparison(baseline_images=['legend_auto1'], tol=15, remove_text=True)
 def test_legend_auto1():
     'Test automatic legend placement'
     fig = plt.figure()
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -28,7 +28,7 @@ def test_clipping():
     ax.plot(t, s, linewidth=1.0)
     ax.set_ylim((-0.20, -0.28))
 
-@image_comparison(baseline_images=['overflow'], tol=1e-2, remove_text=True)
+@image_comparison(baseline_images=['overflow'], tol=100, remove_text=True)
 def test_overflow():
     x = np.array([1.0,2.0,3.0,2.0e5])
     y = np.arange(len(x))
