Issue #761 better diff for apex reference check (more robust xy/yx grid handling)

Author: dsamaey

openeo/testing/results.py

@@ -92,24 +92,24 @@ def _as_xarray_dataarray(data: Union[str, Path, xarray.DataArray]) -> xarray.Dat
 
 
 def ascii_art(diff_data: DataArray) -> str:
-    scale: int = max(1, (diff_data.sizes["x"] / 100))
+    scale: int = max(1, int(diff_data.sizes["x"] / 100))
     data_max = diff_data.max().item()
     if data_max == 0:
         data_max = 1
     grayscale_characters = "$@B%8&WM#*oahkbdpqwmZO0QLCJUYXzcvunxrjft/\|()1{}[]?-_+~<>i!lI;:,\"^`'. "
     coarsened = diff_data.coarsen(dim={"x": scale, "y": scale}, boundary="pad").all()
+    if coarsened.dims[0] != "y":
+        coarsened = coarsened.transpose()
     top = "┌" + "─" * coarsened.sizes["x"] + "┐\n"
     bottom = "\n└" + "─" * coarsened.sizes["x"] + "┘"
-    return (
-        top
-        + "\n".join(
-            [
-                "│" + "".join([grayscale_characters[70 - int(v * 70 / data_max)] for v in row]) + "│"
-                for row in coarsened.transpose()
-            ]
-        )
-        + bottom
-    )
+
+    def pixelChar(v) -> str:
+        i = int(v * 70 / data_max)
+        if v > 0 and i == 0:
+            i = 1
+        return grayscale_characters[69 - i]
+
+    return top + "\n".join(["│" + "".join([pixelChar(v) for v in row]) + "│" for row in coarsened]) + bottom
 
 
 def _compare_xarray_dataarray_xy(
@@ -174,14 +174,18 @@ def _compare_xarray_dataarray_xy(
 
                 key = ",".join([f"{k} {str(v1)}" for k, v1 in indexers.items()])
                 issues.append(
-                    f"{key}: value difference min:{diff_data.min().data}, max: {diff_data.max().data}, mean: {diff_mean}, var: {diff_var}"
+                    f"{key}: value difference exceeds tolerance (rtol {rtol}, atol {atol}), min:{diff_data.min().data}, max: {diff_data.max().data}, mean: {diff_mean}, var: {diff_var}"
                 )
 
                 print(f"Difference ascii art for {key}")
-                print(ascii_art(diff_data))
+                art = ascii_art(diff_data)
+                print(art)
+
+                coord_grid = np.meshgrid(diff_data.coords["x"], diff_data.coords["y"])
 
-                coord_grid = np.meshgrid(diff_data.coords["y"], diff_data.coords["x"])
                 mask = diff_data.notnull()
+                if mask.dims[0] != "y":
+                    mask = mask.transpose()
                 c1 = coord_grid[0][mask]
                 c2 = coord_grid[1][mask]
                 coordinates = np.dstack((c1, c2)).reshape(-1, 2)

tests/testing/test_results.py

@@ -390,11 +390,11 @@ def test_allclose_minimal_xy_different(self, tmp_path, actual_dir, expected_dir)
         with raises_assertion_error_or_not(
             r"Issues for file 'data.nc'.*"
             r"Issues for variable 'b1'.*"
-            r"t 0: value difference min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
+            r"t 0: value difference exceeds tolerance \(rtol 1e-06, atol 1e-06\), min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
             r"t 0: differing pixels: 20/20 \(100.0%\), spread over 100.0% of the area.*"
-            r"t 1: value difference min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
+            r"t 1: value difference exceeds tolerance \(rtol 1e-06, atol 1e-06\), min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
             r"t 1: differing pixels: 20/20 \(100.0%\), spread over 100.0% of the area.*"
-            r"t 2: value difference min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
+            r"t 2: value difference exceeds tolerance \(rtol 1e-06, atol 1e-06\), min:1.0, max: 1.0, mean: 1.0, var: 0.0.*"
             r"t 2: differing pixels: 20/20 \(100.0%\), spread over 100.0% of the area"
         ):
             assert_job_results_allclose(actual=actual_dir, expected=expected_dir, tmp_path=tmp_path)
@@ -432,7 +432,7 @@ def test_allclose_minimal_xy_different_small_area(self, tmp_path, actual_dir, ex
         with raises_assertion_error_or_not(
             r"Issues for file 'data.nc'.*"
             r"Issues for variable 'b2'.*"
-            r"t 2: value difference min:33.0, max: 42.0, mean: 37.5, var: 11.2.*"
+            r"t 2: value difference exceeds tolerance \(rtol 1e-06, atol 1e-06\), min:33.0, max: 42.0, mean: 37.5, var: 11.2.*"
             r"t 2: differing pixels: 4/20 \(20.0%\), spread over 8.3% of the area"
         ):
             assert_job_results_allclose(actual=actual_dir, expected=expected_dir, tmp_path=tmp_path)