Add pytests and workflow for PRs

.gitattributes

@@ -4,3 +4,4 @@
 tests/unit_test_data/final_3d_points.txt filter=lfs diff=lfs merge=lfs -text
 tests/gold_standard_data/final_3d_points.txt filter=lfs diff=lfs merge=lfs -text
 tests/gold_standard_data filter=lfs diff=lfs merge=lfs -text
+*.tif filter=lfs diff=lfs merge=lfs -text

.github/workflows/test.yml

@@ -0,0 +1,74 @@
+name: Build C code and run tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        lfs: false
+
+    - name: Restore LFS cache
+      uses: actions/cache@v3
+      with:
+        path: .git/lfs
+        key: lfs-${{ runner.os }}-${{ github.sha }}
+        restore-keys: |
+          lfs-${{ runner.os }}-
+
+    - name: Fetch only needed LFS files
+      run: |
+        git lfs install
+        git lfs fetch --include="tests/gold_standard_data/**"
+        git lfs checkout
+
+    - name: Install system dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          libpng-dev \
+          libyaml-dev \
+          libgsl-dev \
+          libgdal-dev \
+          libopencv-dev \
+          cmake \
+          build-essential \
+          python3-dev
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11"
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install pytest
+        cd scripts/python
+        pip install -e .
+
+    - name: Configure and build C code
+      run: |
+        mkdir -p build
+        cd build
+        cmake -DWITH_OPENCV=ON  ..
+        make -j$(nproc)
+
+    - name: Run pytest tests
+      run: |
+        pytest --maxfail=3 --tb=short
+
+    - name: Run gtest tests
+      run: |
+        ctest --output-on-failure
+

CMakeLists.txt

@@ -1,18 +1,22 @@
 cmake_minimum_required(VERSION 3.16)
 project(landmark_tools)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(STATUS "Configuring on/for Linux")
+# Enable testing
+enable_testing()
+include(CTest)
+
+if(UNIX AND NOT APPLE)
+    message(STATUS "Configuring for Linux-like system")
     add_definitions(-DLINUX_OS)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    message(STATUS "Configuring on/for Windows")
-    add_definitions(-DWINDOWS_OS)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    # Darwin is the system name for macOS
-    message(STATUS "Configuring on/for macOS")
+elseif(APPLE)
+    message(STATUS "Configuring for macOS")
     add_definitions(-DMAC_OS)
+elseif(WIN32)
+    message(STATUS "Configuring for Windows")
+    add_definitions(-DWINDOWS_OS)
 endif()
 
+
 # Add local CMake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
@@ -84,6 +88,7 @@ src/landmark_tools/math/point_line_plane_util.c
 src/landmark_tools/utils/parse_args.c
 src/landmark_tools/utils/endian_read_write.c
 src/math/mat3/mat3.c
+src/landmark_tools/utils/write_array.c
 )
 
 add_executable( create_landmark
@@ -123,6 +128,7 @@ src/landmark_tools/landmark_util/estimate_homography.c
 src/landmark_tools/feature_tracking/feature_match.c
 src/landmark_tools/feature_tracking/corr_image_long.c
 src/landmark_tools/feature_tracking/parameters.c
+src/landmark_tools/feature_tracking/correlation_results.c
 src/landmark_tools/math/homography_util.c
 src/landmark_tools/utils/two_level_yaml_parser.c
 )
@@ -131,6 +137,7 @@ add_dependencies(landmark_comparison link_public_headers)
 add_executable( landmark_registration
 src/main/landmark_registration_main.c
 ${common_sources}
+src/landmark_tools/landmark_registration/landmark_registration.c
 src/landmark_tools/landmark_util/estimate_homography.c
 src/landmark_tools/feature_selection/int_forstner_extended.c
 src/landmark_tools/feature_tracking/corr_image_long.c
@@ -204,6 +211,7 @@ if (WITH_OPENCV)
     add_library(landmark_tools_opencv_tools
        src/landmark_tools/opencv_tools/opencv_feature_matching.cpp
        src/landmark_tools/opencv_tools/opencv_image_io.cpp
+       src/landmark_tools/opencv_tools/homography_estimation.c
     )
     target_compile_features(landmark_tools_opencv_tools PUBLIC cxx_std_11)
     target_include_directories(landmark_tools_opencv_tools PRIVATE ${OpenCV_INCLUDE_DIRS})
@@ -213,9 +221,14 @@ if (WITH_OPENCV)
     add_executable(image_comparison
         src/main/image_comparison_main.c
         ${common_sources}
+        src/landmark_tools/landmark_util/estimate_homography.c
         src/landmark_tools/feature_tracking/feature_match.c
         src/landmark_tools/feature_tracking/corr_image_long.c
         src/landmark_tools/feature_tracking/parameters.c
+        src/landmark_tools/opencv_tools/opencv_feature_matching.cpp 
+        src/landmark_tools/opencv_tools/homography_estimation.c
+        src/landmark_tools/opencv_tools/feature_matching_2d.c
+        src/landmark_tools/feature_tracking/correlation_results.c
         src/landmark_tools/math/homography_util.c
         src/landmark_tools/utils/two_level_yaml_parser.c
     )
@@ -232,28 +245,35 @@ file(GLOB_RECURSE library_sources
  "${CMAKE_CURRENT_SOURCE_DIR}/src/math/*.c"
  "${CMAKE_CURRENT_SOURCE_DIR}/src/img/*.c")
 
-## Shared library
+# Remove cpp files
+list(REMOVE_ITEM library_sources
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/landmark_tools/opencv_tools/homography_estimation.c"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/landmark_tools/opencv_tools/feature_matching_2d.c"
+)
 
-add_library(landmark_tools
-SHARED
-${library_sources}
-${CMAKE_CURRENT_SOURCE_DIR}/submodules/librply/src/lib/rply.c
+# Build the landmark_tools library first
+add_library(landmark_tools SHARED
+  ${library_sources}
+  ${CMAKE_CURRENT_SOURCE_DIR}/submodules/librply/src/lib/rply.c
 )
 
 target_include_directories(landmark_tools PUBLIC
     ${PNG_INCLUDE_DIRS})
 
 target_include_directories(landmark_tools INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>  # During build
-    $<INSTALL_INTERFACE:include>  # During installation
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
 )
 
 if(GDAL_FOUND)
-    target_link_libraries( landmark_tools PUBLIC GDAL::GDAL ${yaml_LIBRARIES} ${PNG_LIBRARIES} ${GSL_LIBRARIES} m -lz)
+    target_link_libraries(landmark_tools PUBLIC GDAL::GDAL ${yaml_LIBRARIES} ${PNG_LIBRARIES} ${GSL_LIBRARIES} m -lz)
 else()
-    target_link_libraries( landmark_tools PUBLIC ${yaml_LIBRARIES} ${PNG_LIBRARIES} ${GSL_LIBRARIES} m -lz)
+    target_link_libraries(landmark_tools PUBLIC ${yaml_LIBRARIES} ${PNG_LIBRARIES} ${GSL_LIBRARIES} m -lz)
 endif()
 
+# Then add the tests
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp)
+
 install(TARGETS landmark_tools EXPORT LandmarkTools
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib

tests/Distortion Correlation Impact.ipynb → example/Distortion Correlation Impact.ipynb

@@ -1,5 +1,21 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "d236b7d9-0991-4e00-b27d-f60671cbaefc",
+   "metadata": {},
+   "source": [
+    "# Distortion Impact\n",
+    "\n",
+    "Recreate the analysis from \n",
+    "\n",
+    "Cecilia Mauceri, Yang Cheng, Yumi Iwashita and Adnan Ansar. \"A Validation Pipeline for Lunar Digital Elevation Models,\" AIAA 2025-2072. AIAA SCITECH 2025 Forum. January 2025. [link](https://arc.aiaa.org/doi/abs/10.2514/6.2025-2072)\n",
+    "\n",
+    "This script artificially distorts DEMs to create map distortion with known parameters and then demonstrates how the correlator can detect this distortion.\n",
+    "\n",
+    "## Setup"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 1,
@@ -45,6 +61,14 @@
     "plt.rcParams['figure.figsize'] = [10, 3]"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "09cbfc1c-cb87-4d87-8eed-95db43566dff",
+   "metadata": {},
+   "source": [
+    "## Render DEM for visual comparison"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 3,
@@ -231,7 +255,7 @@
    "source": [
     "## Self-compare\n",
     "\n",
-    "Landmark compared to itself should have near zero deltas"
+    "Landmark compared to itself without distortion should have near zero deltas"
    ]
   },
   {