Updated landmark_comparison regression. All tests should pass

Author: crmauceri

src/landmark_tools/landmark_util/landmark.c

@@ -165,7 +165,7 @@ bool Write_LMK(const char *filename, const LMK *lmk)
 
     size_t version_size = 32;
     char version[version_size];
-    strncpy(version, "#! LVS Map v3.0", version_size);
+    strncpy(version, "#! LVS Map v3.0", 16);
     if(fwrite(version, sizeof(uint8_t), version_size, fp) != version_size) return false;
 
      if(fwrite(&lmk->lmk_id, sizeof(uint8_t), LMK_ID_SIZE, fp) != LMK_ID_SIZE) return false;
@@ -235,7 +235,7 @@ bool Read_LMK(const char *filename, LMK *lmk)
     size_t char_array_size = 32;
     char char_array[char_array_size];
     if(fread(char_array, sizeof(char), char_array_size, fp) != char_array_size) return false;
-    SAFE_PRINTF(64, "%s\n", char_array);
+    SAFE_PRINTF(char_array_size, "%s\n", char_array);
 
     if(fread(lmk->lmk_id, sizeof(char), LMK_ID_SIZE, fp) != LMK_ID_SIZE) return false;
 

tests/gold_standard_data/README.md

@@ -13,3 +13,4 @@ The polar stereo DEM is a crop from Site 01 from [High-Resolution LOLA Topograph
 The landmark files were created from polar stereo DEMs using commit 7ff339f07fbc0e7599d24590a7f81c3a060ad30d due to inconsistancy with how polar stereo projection was handled in  
 6828ae2084eeace3a21210e195c91de76c194923
 
+The comparison raw files were created using f6f06a1c5f2710689f38cf30f74021475006421e.

tests/gold_standard_data/comparison_corr_500by500.raw

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c8e0cf02800389e5cc26e418682dc9acf460a334a5cecdfbda67868279855be
+oid sha256:a190c0f470dd8bbc3672c6339fdce5922744c89862b13b75813a22ff11eab561
 size 1000000

tests/gold_standard_data/comparison_delta_x_500by500.raw

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60cb70e1ba55504a30023f9ccd2d717ccf7e2ec93b21bd49a56bac024aa88af6
+oid sha256:317ff0c5e0e3012319c0d17c4e49ec8274c71a557ed2daa2c1ced2b34129f4cc
 size 1000000

tests/gold_standard_data/comparison_delta_y_500by500.raw

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:659f7eb88a255d68ed0dd6483aeb774edc3d6b1ba241a30130f2a14ab5f3af5f
+oid sha256:b9da08a8ca723b14f09aade75456a10aac57659b9ed381fd542b23efa4d14698
 size 1000000

tests/gold_standard_data/comparison_delta_z_500by500.raw

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a28ec5a69a37657f4aa9b0362b2f2e9e24d692555116157810df06143736003e
+oid sha256:05ac06c12e247fb25a540db57500340c66835279dce0c9d5ab09e700d1496587
 size 1000000

tests/test_landmark_comparison.py

@@ -35,11 +35,16 @@ def test_landmark_comparison_regression(tmp_path):
     for key,I1 in displacement_maps1.items():
         I2 = displacement_maps2[key]
         mask = np.logical_not(np.logical_or(np.isnan(I1), np.isnan(I2)))
-        np.testing.assert_allclose(I1[mask], I2[mask], rtol=0, atol=1)
+        if(key != "correlation"):
+            np.testing.assert_allclose(I1[mask], I2[mask], rtol=0, atol=1)
+        else:
+            np.testing.assert_allclose(I1[mask], I2[mask])
 
 
 def test_landmark_comparison_self(tmp_path):
     """A landmark compared to itself should have zero disparity
+
+    The resolution of the map is 5m/px. The test tolerance is < 5m maximum, so sub-pixel disparity.
     """
     output_prefix = tmp_path / "comparison"
 
@@ -60,7 +65,7 @@ def test_landmark_comparison_self(tmp_path):
     for key,I1 in displacement_maps1.items():
         if(key != "correlation"):
             # Displacement should be low
-            np.testing.assert_allclose(I1[np.logical_not(np.isnan(I1))], 0, rtol=0, atol=1)
+            np.testing.assert_allclose(I1[np.logical_not(np.isnan(I1))], 0, rtol=0, atol=5)
         else:
             # Correlation should be high
             assert np.all(I1[np.logical_not(np.isnan(I1))] > 0.7), "Not all elements are greater than 0.7"