Restructure

.gitignore

@@ -7,3 +7,5 @@ Makefile.dep
 /libdvrlib.a
 /src/main
 /build/
+/build-cov
+/coverage-html

CMakeLists.txt

@@ -6,26 +6,44 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(GSL REQUIRED)
 
+include(FetchContent)
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        v3.8.0
+)
+FetchContent_MakeAvailable(Catch2)
+
 # Core library
 add_library(dvrlib STATIC
     src/gsl_wrapper.cc
     src/recon.cc
     src/recon_system.cc
-    src/vdi2048.cc
 )
 target_include_directories(dvrlib PUBLIC src)
 target_link_libraries(dvrlib PUBLIC GSL::gsl GSL::gslcblas)
 target_compile_options(dvrlib PRIVATE -Wall)
 
-# Test / example executable
+# Tests
 add_executable(dvrlib_main
-    src/main.cc
-    src/gsl_wrapper_tests.cc
-    src/recon_tests.cc
+    test/main.cc
+    test/gsl_wrapper_tests.cc
+    test/recon_tests.cc
+    test/vdi2048_test.cc
 )
-target_link_libraries(dvrlib_main PRIVATE dvrlib)
+target_link_libraries(dvrlib_main PRIVATE dvrlib Catch2::Catch2)
 target_compile_options(dvrlib_main PRIVATE -Wall)
 
+include(CTest)
+include(Catch)
+catch_discover_tests(dvrlib_main)
+
+# Demo
+add_executable(dvrlib_demo demo/vdi2048_demo.cc demo/vdi2048.cc)
+target_link_libraries(dvrlib_demo PRIVATE dvrlib)
+target_include_directories(dvrlib_demo PRIVATE demo)
+target_compile_options(dvrlib_demo PRIVATE -Wall)
+
 # Documentation (optional — requires Doxygen)
 find_package(Doxygen)
 if(DOXYGEN_FOUND)

Makefile

@@ -0,0 +1,42 @@
+.PHONY: all demo test coverage coverage-html clean
+
+BUILD     = build
+BUILD_COV = build-cov
+COV_OUT   = coverage-html
+
+all: $(BUILD)/CMakeCache.txt
+	cmake --build $(BUILD) -- -s
+
+demo: all
+	$(BUILD)/dvrlib_demo
+
+test: all
+	@$(BUILD)/dvrlib_main
+
+coverage: $(BUILD_COV)/CMakeCache.txt
+	cmake --build $(BUILD_COV) -- -s
+	$(BUILD_COV)/dvrlib_main
+	@cd $(BUILD_COV)/CMakeFiles/dvrlib.dir/src && \
+	    gcov *.gcno 2>/dev/null \
+	        | awk '/File.*\/src\/[^/]+\.cc/{f=1; print} f && /Lines executed/{print; f=0}'; \
+	    rm -f *.gcov 2>/dev/null || true
+
+coverage-html: $(BUILD_COV)/CMakeCache.txt
+	@which lcov > /dev/null 2>&1 || { echo "lcov not found. Install with: sudo apt install lcov"; exit 1; }
+	cmake --build $(BUILD_COV) -- -s
+	$(BUILD_COV)/dvrlib_main
+	lcov --capture --directory $(BUILD_COV) --output-file $(BUILD_COV)/coverage.info
+	lcov --remove $(BUILD_COV)/coverage.info '*/build-cov/_deps/*' '/usr/*' --output-file $(BUILD_COV)/coverage.info
+	genhtml $(BUILD_COV)/coverage.info --output-directory $(COV_OUT)
+	@echo "Report: $(COV_OUT)/index.html"
+
+$(BUILD)/CMakeCache.txt:
+	cmake -B $(BUILD) -S . -DCMAKE_BUILD_TYPE=Debug
+
+$(BUILD_COV)/CMakeCache.txt:
+	cmake -B $(BUILD_COV) -S . -DCMAKE_BUILD_TYPE=Debug \
+	    -DCMAKE_CXX_FLAGS="--coverage" \
+	    -DCMAKE_EXE_LINKER_FLAGS="--coverage"
+
+clean:
+	rm -rf $(BUILD) $(BUILD_COV) $(COV_OUT)

demo/vdi2048_demo.cc

@@ -0,0 +1,10 @@
+#include "gsl_wrapper.h"
+#include "vdi2048.h"
+
+using namespace dvrlib;
+
+int main() {
+    gsl_enable_exceptions();
+    example_VDI2048();
+    return 0;
+}