Increase precision and overhaul tests

ayshih · ayshih · commit b3d74fc2367b · 2025-12-09T09:41:25.000-05:00
diff --git a/lib/matplotlib/_cm_bivar.py b/lib/matplotlib/_cm_bivar.py
@@ -1276,30 +1276,30 @@
      ]).reshape((65, 65, 3))
 
 BiOrangeBlue = np.array(
-    [0.000, 0.000, 0.000, 0.000, 0.062, 0.125, 0.000, 0.125, 0.250, 0.000,
-     0.188, 0.375, 0.000, 0.250, 0.500, 0.000, 0.312, 0.625, 0.000, 0.375,
-     0.750, 0.000, 0.438, 0.875, 0.000, 0.500, 1.000, 0.125, 0.062, 0.000,
-     0.125, 0.125, 0.125, 0.125, 0.188, 0.250, 0.125, 0.250, 0.375, 0.125,
-     0.312, 0.500, 0.125, 0.375, 0.625, 0.125, 0.438, 0.750, 0.125, 0.500,
-     0.875, 0.125, 0.562, 1.000, 0.250, 0.125, 0.000, 0.250, 0.188, 0.125,
-     0.250, 0.250, 0.250, 0.250, 0.312, 0.375, 0.250, 0.375, 0.500, 0.250,
-     0.438, 0.625, 0.250, 0.500, 0.750, 0.250, 0.562, 0.875, 0.250, 0.625,
-     1.000, 0.375, 0.188, 0.000, 0.375, 0.250, 0.125, 0.375, 0.312, 0.250,
-     0.375, 0.375, 0.375, 0.375, 0.438, 0.500, 0.375, 0.500, 0.625, 0.375,
-     0.562, 0.750, 0.375, 0.625, 0.875, 0.375, 0.688, 1.000, 0.500, 0.250,
-     0.000, 0.500, 0.312, 0.125, 0.500, 0.375, 0.250, 0.500, 0.438, 0.375,
-     0.500, 0.500, 0.500, 0.500, 0.562, 0.625, 0.500, 0.625, 0.750, 0.500,
-     0.688, 0.875, 0.500, 0.750, 1.000, 0.625, 0.312, 0.000, 0.625, 0.375,
-     0.125, 0.625, 0.438, 0.250, 0.625, 0.500, 0.375, 0.625, 0.562, 0.500,
-     0.625, 0.625, 0.625, 0.625, 0.688, 0.750, 0.625, 0.750, 0.875, 0.625,
-     0.812, 1.000, 0.750, 0.375, 0.000, 0.750, 0.438, 0.125, 0.750, 0.500,
-     0.250, 0.750, 0.562, 0.375, 0.750, 0.625, 0.500, 0.750, 0.688, 0.625,
-     0.750, 0.750, 0.750, 0.750, 0.812, 0.875, 0.750, 0.875, 1.000, 0.875,
-     0.438, 0.000, 0.875, 0.500, 0.125, 0.875, 0.562, 0.250, 0.875, 0.625,
-     0.375, 0.875, 0.688, 0.500, 0.875, 0.750, 0.625, 0.875, 0.812, 0.750,
-     0.875, 0.875, 0.875, 0.875, 0.938, 1.000, 1.000, 0.500, 0.000, 1.000,
-     0.562, 0.125, 1.000, 0.625, 0.250, 1.000, 0.688, 0.375, 1.000, 0.750,
-     0.500, 1.000, 0.812, 0.625, 1.000, 0.875, 0.750, 1.000, 0.938, 0.875,
+    [0.000, 0.000, 0.000, 0.000, 0.0625, 0.125, 0.000, 0.125, 0.250, 0.000,
+     0.1875, 0.375, 0.000, 0.250, 0.500, 0.000, 0.3125, 0.625, 0.000, 0.375,
+     0.750, 0.000, 0.4375, 0.875, 0.000, 0.500, 1.000, 0.125, 0.0625, 0.000,
+     0.125, 0.125, 0.125, 0.125, 0.1875, 0.250, 0.125, 0.250, 0.375, 0.125,
+     0.3125, 0.500, 0.125, 0.375, 0.625, 0.125, 0.4375, 0.750, 0.125, 0.500,
+     0.875, 0.125, 0.5625, 1.000, 0.250, 0.125, 0.000, 0.250, 0.1875, 0.125,
+     0.250, 0.250, 0.250, 0.250, 0.3125, 0.375, 0.250, 0.375, 0.500, 0.250,
+     0.4375, 0.625, 0.250, 0.500, 0.750, 0.250, 0.5625, 0.875, 0.250, 0.625,
+     1.000, 0.375, 0.1875, 0.000, 0.375, 0.250, 0.125, 0.375, 0.3125, 0.250,
+     0.375, 0.375, 0.375, 0.375, 0.4375, 0.500, 0.375, 0.500, 0.625, 0.375,
+     0.5625, 0.750, 0.375, 0.625, 0.875, 0.375, 0.6875, 1.000, 0.500, 0.250,
+     0.000, 0.500, 0.3125, 0.125, 0.500, 0.375, 0.250, 0.500, 0.4375, 0.375,
+     0.500, 0.500, 0.500, 0.500, 0.5625, 0.625, 0.500, 0.625, 0.750, 0.500,
+     0.6875, 0.875, 0.500, 0.750, 1.000, 0.625, 0.3125, 0.000, 0.625, 0.375,
+     0.125, 0.625, 0.4375, 0.250, 0.625, 0.500, 0.375, 0.625, 0.5625, 0.500,
+     0.625, 0.625, 0.625, 0.625, 0.6875, 0.750, 0.625, 0.750, 0.875, 0.625,
+     0.8125, 1.000, 0.750, 0.375, 0.000, 0.750, 0.4375, 0.125, 0.750, 0.500,
+     0.250, 0.750, 0.5625, 0.375, 0.750, 0.625, 0.500, 0.750, 0.6875, 0.625,
+     0.750, 0.750, 0.750, 0.750, 0.8125, 0.875, 0.750, 0.875, 1.000, 0.875,
+     0.4375, 0.000, 0.875, 0.500, 0.125, 0.875, 0.5625, 0.250, 0.875, 0.625,
+     0.375, 0.875, 0.6875, 0.500, 0.875, 0.750, 0.625, 0.875, 0.8125, 0.750,
+     0.875, 0.875, 0.875, 0.875, 0.9375, 1.000, 1.000, 0.500, 0.000, 1.000,
+     0.5625, 0.125, 1.000, 0.625, 0.250, 1.000, 0.6875, 0.375, 1.000, 0.750,
+     0.500, 1.000, 0.8125, 0.625, 1.000, 0.875, 0.750, 1.000, 0.9375, 0.875,
      1.000, 1.000, 1.000,
      ]).reshape((9, 9, 3))
 
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -2127,13 +2127,13 @@ def test_colorizer_multinorm_implicit():
 
     # test call with two single values
     data = [0.1, 0.2]
-    res = (0.098039, 0.149212, 0.2, 1.0)
+    res = (0.098039, 0.149020, 0.2, 1.0)
     assert_array_almost_equal(ca.to_rgba(data), res)
 
     # test call with two 1d arrays
     data = [[0.1, 0.2], [0.3, 0.4]]
-    res = [[0.09803922, 0.19832211, 0.29803922, 1.],
-           [0.2, 0.29972, 0.4, 1.]]
+    res = [[0.09803922, 0.19803922, 0.29803922, 1.],
+           [0.2, 0.3, 0.4, 1.]]
     assert_array_almost_equal(ca.to_rgba(data), res)
 
     # test call with two 2d arrays
@@ -2191,7 +2191,7 @@ def test_colorizer_multinorm_explicit():
 
     # test call with two single values
     data = [0.1, 0.2]
-    res = (0.098039, 0.374506, 0.65098, 1.)
+    res = (0.098039, 0.374510, 0.65098, 1.)
     assert_array_almost_equal(ca.to_rgba(data), res)
 
 
diff --git a/lib/matplotlib/tests/test_multivariate_colormaps.py b/lib/matplotlib/tests/test_multivariate_colormaps.py
@@ -220,10 +220,18 @@ def test_bivar_cmap_call_tuple():
 
 def test_bivar_cmap_lut_smooth():
     cmap = mpl.bivar_colormaps['BiOrangeBlue']
+
     assert_allclose(cmap.lut[:, 0, 0], np.linspace(0, 1, 256))
-    assert_allclose(cmap.lut[:, 0, 1], np.linspace(0, 0.5, 256), atol=1e-3)
-    assert_allclose(cmap.lut[0, :, 1], np.linspace(0, 0.5, 256), atol=1e-3)
+    assert_allclose(cmap.lut[:, 255, 0], np.linspace(0, 1, 256))
+    assert_allclose(cmap.lut[:, 0, 1], np.linspace(0, 0.5, 256))
+    assert_allclose(cmap.lut[:, 153, 1], np.linspace(0.3, 0.8, 256))
+    assert_allclose(cmap.lut[:, 255, 1], np.linspace(0.5, 1, 256))
+
+    assert_allclose(cmap.lut[0, :, 1], np.linspace(0, 0.5, 256))
+    assert_allclose(cmap.lut[102, :, 1], np.linspace(0.2, 0.7, 256))
+    assert_allclose(cmap.lut[255, :, 1], np.linspace(0.5, 1, 256))
     assert_allclose(cmap.lut[0, :, 2], np.linspace(0, 1, 256))
+    assert_allclose(cmap.lut[255, :, 2], np.linspace(0, 1, 256))
 
 
 def test_bivar_cmap_call():
@@ -326,23 +334,27 @@ def test_bivar_cmap_1d_origin():
     """
     Test getting 1D colormaps with different origins
     """
-    cmap = mpl.bivar_colormaps['BiOrangeBlue']
-    assert_allclose(cmap[0](1.), (1., 0.5, 0., 1.))
-    assert_allclose(cmap[1](1.), (0., 0.5, 1., 1.))
-
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].with_extremes(origin=(0, 1))
-    assert_allclose(cmap[0](1.), (1., 1., 1., 1.))
-    assert_allclose(cmap[1](1.), (0., 0.5, 1., 1.))
-
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].with_extremes(origin=(0.5, 0.5))
-    assert_allclose(cmap[0](0.5),
-                    (0.5019607843137255, 0.5019453440984237, 0.5019607843137255, 1))
-    assert_allclose(cmap[1](0.5),
-                    (0.5019607843137255, 0.5019453440984237, 0.5019607843137255, 1))
-
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].with_extremes(origin=(1, 1))
-    assert_allclose(cmap[0](1.), (1., 1., 1., 1.))
-    assert_allclose(cmap[1](1.), (1., 1., 1., 1.))
+    cmap0 = mpl.bivar_colormaps['BiOrangeBlue']
+    assert_allclose(cmap0[0].colors[:, 0], np.linspace(0, 1, 256))
+    assert_allclose(cmap0[0].colors[:, 1], np.linspace(0, 0.5, 256))
+    assert_allclose(cmap0[0].colors[:, 2], 0)
+    assert_allclose(cmap0[1].colors[:, 0], 0)
+    assert_allclose(cmap0[1].colors[:, 1], np.linspace(0, 0.5, 256))
+    assert_allclose(cmap0[1].colors[:, 2], np.linspace(0, 1, 256))
+
+    cmap1 = cmap0.with_extremes(origin=(0, 1))
+    assert_allclose(cmap1[0].colors[:, 0], np.linspace(0, 1, 256))
+    assert_allclose(cmap1[0].colors[:, 1], np.linspace(0.5, 1, 256))
+    assert_allclose(cmap1[0].colors[:, 2], 1)
+    assert_allclose(cmap1[1].colors, cmap0[1].colors)
+
+    cmap2 = cmap0.with_extremes(origin=(0.2, 0.4))
+    assert_allclose(cmap2[0].colors[:, 0], np.linspace(0, 1, 256))
+    assert_allclose(cmap2[0].colors[:, 1], np.linspace(0.2, 0.7, 256))
+    assert_allclose(cmap2[0].colors[:, 2], 0.4)
+    assert_allclose(cmap2[1].colors[:, 0], 0.2)
+    assert_allclose(cmap2[1].colors[:, 1], np.linspace(0.1, 0.6, 256))
+    assert_allclose(cmap2[1].colors[:, 2], np.linspace(0, 1, 256))
 
     with pytest.raises(KeyError,
                        match="only 0 or 1 are valid keys"):
@@ -454,22 +466,18 @@ def test_bivar_cmap_from_image():
 
 
 def test_bivar_resample():
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].resampled((2, 2))
-    assert_allclose(cmap((0.25, 0.25)), (0, 0, 0, 1))
-
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].resampled((-2, 2))
-    assert_allclose(cmap((0.25, 0.25)), (1., 0.5, 0., 1.))
+    cmap = mpl.bivar_colormaps['BiOrangeBlue']
 
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].resampled((2, -2))
-    assert_allclose(cmap((0.25, 0.25)), (0., 0.5, 1., 1.))
+    assert_allclose(cmap.resampled((2, 2))((0.25, 0.25)), (0, 0, 0, 1))
+    assert_allclose(cmap.resampled((-2, 2))((0.25, 0.25)), (1., 0.5, 0., 1.))
+    assert_allclose(cmap.resampled((2, -2))((0.25, 0.25)), (0., 0.5, 1., 1.))
+    assert_allclose(cmap.resampled((-2, -2))((0.25, 0.25)), (1, 1, 1, 1))
 
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].resampled((-2, -2))
-    assert_allclose(cmap((0.25, 0.25)), (1, 1, 1, 1))
+    assert_allclose(cmap((0.8, 0.4)), (0.8, 0.6, 0.4, 1.))
+    assert_allclose(cmap.reversed()((1 - 0.8, 1 - 0.4)), (0.8, 0.6, 0.4, 1.))
 
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].reversed()
-    assert_allclose(cmap((0.25, 0.25)), (0.74902, 0.74902, 0.74902, 1.), atol=1e-5)
-    cmap = mpl.bivar_colormaps['BiOrangeBlue'].transposed()
-    assert_allclose(cmap((0.25, 0.25)), (0.25098, 0.25098, 0.25098, 1.), atol=1e-5)
+    assert_allclose(cmap((0.6, 0.2)), (0.6, 0.4, 0.2, 1.))
+    assert_allclose(cmap.transposed()((0.2, 0.6)), (0.6, 0.4, 0.2, 1.))
 
     with pytest.raises(ValueError, match="lutshape must be of length"):
         cmap = cmap.resampled(4)
