reorganizing into year

K20shores · Dec 5, 2024 · d6d2cfb · d6d2cfb
1 parent e3c7cae
commit d6d2cfb
Show file tree

Hide file tree

Showing 50 changed files with 85 additions and 34 deletions.
diff --git a/.clang-format b/.clang-format
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 build
-src/2023/inputs
-src/2024/inputs
+inputs
+inputs
diff --git a/2023/CMakeLists.txt b/2023/CMakeLists.txt
@@ -0,0 +1,31 @@
+################################################################################
+# Preamble
+cmake_minimum_required(VERSION 3.21)
+
+project(
+  aoc
+  VERSION 0.0.2023
+  LANGUAGES CXX
+)
+
+message(STATUS "CMake build configuration for ${PROJECT_NAME} (${CMAKE_BUILD_TYPE}) ${PROJECT_VERSION}")
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake")
+
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+################################################################################
+# dependencies
+
+include(cmake/dependencies.cmake)
+
+################################################################################
+# targets
+
+enable_testing()
+add_subdirectory(src)
+
+################################################################################
diff --git a/cmake/dependencies.cmake → 2023/cmake/dependencies.cmake b/cmake/dependencies.cmake → 2023/cmake/dependencies.cmake
diff --git a/cmake/test_util.cmake → 2023/cmake/test_util.cmake b/cmake/test_util.cmake → 2023/cmake/test_util.cmake
diff --git a/include/aoc/2023/get_char.hpp → 2023/include/aoc/2023/get_char.hpp b/include/aoc/2023/get_char.hpp → 2023/include/aoc/2023/get_char.hpp
diff --git a/include/aoc/2023/hash.hpp → 2023/include/aoc/2023/hash.hpp b/include/aoc/2023/hash.hpp → 2023/include/aoc/2023/hash.hpp
diff --git a/include/aoc/2023/maths.hpp → 2023/include/aoc/2023/maths.hpp b/include/aoc/2023/maths.hpp → 2023/include/aoc/2023/maths.hpp
diff --git a/include/aoc/2023/position.hpp → 2023/include/aoc/2023/position.hpp b/include/aoc/2023/position.hpp → 2023/include/aoc/2023/position.hpp
diff --git a/include/aoc/2023/trie.hpp → 2023/include/aoc/2023/trie.hpp b/include/aoc/2023/trie.hpp → 2023/include/aoc/2023/trie.hpp
diff --git a/src/2023/CMakeLists.txt → 2023/src/CMakeLists.txt b/src/2023/CMakeLists.txt → 2023/src/CMakeLists.txt
diff --git a/src/2023/day1.cpp → 2023/src/day1.cpp b/src/2023/day1.cpp → 2023/src/day1.cpp
diff --git a/src/2023/day10.cpp → 2023/src/day10.cpp b/src/2023/day10.cpp → 2023/src/day10.cpp
diff --git a/src/2023/day11.cpp → 2023/src/day11.cpp b/src/2023/day11.cpp → 2023/src/day11.cpp
diff --git a/src/2023/day12.cpp → 2023/src/day12.cpp b/src/2023/day12.cpp → 2023/src/day12.cpp
diff --git a/src/2023/day13.cpp → 2023/src/day13.cpp b/src/2023/day13.cpp → 2023/src/day13.cpp
diff --git a/src/2023/day14.cpp → 2023/src/day14.cpp b/src/2023/day14.cpp → 2023/src/day14.cpp
diff --git a/src/2023/day15.cpp → 2023/src/day15.cpp b/src/2023/day15.cpp → 2023/src/day15.cpp
diff --git a/src/2023/day16.cpp → 2023/src/day16.cpp b/src/2023/day16.cpp → 2023/src/day16.cpp
diff --git a/src/2023/day17.cpp → 2023/src/day17.cpp b/src/2023/day17.cpp → 2023/src/day17.cpp
diff --git a/src/2023/day18.cpp → 2023/src/day18.cpp b/src/2023/day18.cpp → 2023/src/day18.cpp
diff --git a/src/2023/day19.cpp → 2023/src/day19.cpp b/src/2023/day19.cpp → 2023/src/day19.cpp
diff --git a/src/2023/day2.cpp → 2023/src/day2.cpp b/src/2023/day2.cpp → 2023/src/day2.cpp
diff --git a/src/2023/day20.cpp → 2023/src/day20.cpp b/src/2023/day20.cpp → 2023/src/day20.cpp
diff --git a/src/2023/day21.cpp → 2023/src/day21.cpp b/src/2023/day21.cpp → 2023/src/day21.cpp
diff --git a/src/2023/day22.cpp → 2023/src/day22.cpp b/src/2023/day22.cpp → 2023/src/day22.cpp
diff --git a/src/2023/day3.cpp → 2023/src/day3.cpp b/src/2023/day3.cpp → 2023/src/day3.cpp
diff --git a/src/2023/day4.cpp → 2023/src/day4.cpp b/src/2023/day4.cpp → 2023/src/day4.cpp
diff --git a/src/2023/day5.cpp → 2023/src/day5.cpp b/src/2023/day5.cpp → 2023/src/day5.cpp
diff --git a/src/2023/day6.cpp → 2023/src/day6.cpp b/src/2023/day6.cpp → 2023/src/day6.cpp
diff --git a/src/2023/day7.cpp → 2023/src/day7.cpp b/src/2023/day7.cpp → 2023/src/day7.cpp
diff --git a/src/2023/day8.cpp → 2023/src/day8.cpp b/src/2023/day8.cpp → 2023/src/day8.cpp
diff --git a/src/2023/day9.cpp → 2023/src/day9.cpp b/src/2023/day9.cpp → 2023/src/day9.cpp
diff --git a/src/2023/day_template.cpp → 2023/src/day_template.cpp b/src/2023/day_template.cpp → 2023/src/day_template.cpp
diff --git a/src/2023/lib/CMakeLists.txt → 2023/src/lib/CMakeLists.txt b/src/2023/lib/CMakeLists.txt → 2023/src/lib/CMakeLists.txt
diff --git a/src/2023/lib/get_char.cpp → 2023/src/lib/get_char.cpp b/src/2023/lib/get_char.cpp → 2023/src/lib/get_char.cpp
diff --git a/src/2023/lib/hash.cpp → 2023/src/lib/hash.cpp b/src/2023/lib/hash.cpp → 2023/src/lib/hash.cpp
diff --git a/src/2023/lib/maths.cpp → 2023/src/lib/maths.cpp b/src/2023/lib/maths.cpp → 2023/src/lib/maths.cpp
diff --git a/CMakeLists.txt → 2024/CMakeLists.txt b/CMakeLists.txt → 2024/CMakeLists.txt
@@ -13,17 +13,10 @@ message(STATUS "CMake build configuration for ${PROJECT_NAME} (${CMAKE_BUILD_TYP
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake")
 
-# Set the minimum required C++ standard to C++20
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-################################################################################
-# options
-
-option(AOC_2023 "Build the AoC 2023 project" OFF)
-option(AOC_2024 "Build the AoC 2023 project" ON)
-
 ################################################################################
 # dependencies
 

diff --git a/2024/cmake/dependencies.cmake b/2024/cmake/dependencies.cmake
@@ -0,0 +1,12 @@
+include(FetchContent)
+
+set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON)
+set(BENCHMARK_ENABLE_TESTING OFF)
+# Fetch Google Benchmark
+FetchContent_Declare(
+    benchmark
+    GIT_REPOSITORY https://github.com/google/benchmark.git
+    GIT_TAG v1.8.3
+)
+
+FetchContent_MakeAvailable(benchmark)
diff --git a/2024/cmake/test_util.cmake b/2024/cmake/test_util.cmake
@@ -0,0 +1,40 @@
+################################################################################
+# build and add a standard test
+
+function(create_standard_test)
+  set(prefix TEST)
+  set(singleValues NAME WORKING_DIRECTORY YEAR)
+  set(multiValues SOURCES LIBRARIES)
+
+  include(CMakeParseArguments)
+  cmake_parse_arguments(${prefix} " " "${singleValues}" "${multiValues}" ${ARGN})
+
+  if(NOT DEFINED TEST_YEAR)
+    message(FATAL_ERROR "TEST_YEAR must be specified")
+  endif()
+
+  add_executable(test_${TEST_NAME} ${TEST_SOURCES})
+
+  set_target_properties(test_${TEST_NAME} PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${TEST_YEAR}"
+  )
+
+  target_link_libraries(test_${TEST_NAME} PUBLIC benchmark ${TEST_LIBRARIES})
+
+  if(NOT DEFINED TEST_WORKING_DIRECTORY)
+    set(TEST_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${TEST_YEAR}")
+  endif()
+
+  add_aoc_test(${TEST_NAME} test_${TEST_NAME} "" ${TEST_WORKING_DIRECTORY})
+endfunction(create_standard_test)
+
+################################################################################
+# Add a test
+
+function(add_aoc_test test_name test_binary test_args working_dir)
+    add_test(NAME ${test_name}
+            COMMAND ${test_binary} ${test_args}
+            WORKING_DIRECTORY ${working_dir})
+endfunction(add_aoc_test)
+
+################################################################################
diff --git a/src/2024/CMakeLists.txt → 2024/src/CMakeLists.txt b/src/2024/CMakeLists.txt → 2024/src/CMakeLists.txt
diff --git a/src/2024/day1.cpp → 2024/src/day1.cpp b/src/2024/day1.cpp → 2024/src/day1.cpp
diff --git a/src/2024/day2.cpp → 2024/src/day2.cpp b/src/2024/day2.cpp → 2024/src/day2.cpp
diff --git a/src/2024/day3.cpp → 2024/src/day3.cpp b/src/2024/day3.cpp → 2024/src/day3.cpp
diff --git a/src/2024/day4.cpp → 2024/src/day4.cpp b/src/2024/day4.cpp → 2024/src/day4.cpp
diff --git a/src/2024/day_template.cpp → 2024/src/day_template.cpp b/src/2024/day_template.cpp → 2024/src/day_template.cpp
diff --git a/src/2024/lib/CMakeLists.txt → 2024/src/lib/CMakeLists.txt b/src/2024/lib/CMakeLists.txt → 2024/src/lib/CMakeLists.txt
diff --git a/src/2024/lib/file.cpp → 2024/src/lib/file.cpp b/src/2024/lib/file.cpp → 2024/src/lib/file.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt