Switch to cmake

fontanf · Apr 16, 2024 · 8ea1a96 · 8ea1a96
1 parent d65d197
commit 8ea1a96
Show file tree

Hide file tree

Showing 110 changed files with 368 additions and 378 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,6 +13,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.8"]
 
+    env:
+      TRAVELLING_THIEF_DATA: ${{ github.workspace }}/data/travelling_thief
+      TRAVELLING_WHILE_PACKING_DATA: ${{ github.workspace }}/data/travelling_while_packing
+      PACKING_WHILE_TRAVELLING_DATA: ${{ github.workspace }}/data/packing_while_travelling
+      THIEF_ORIENTEERING_DATA: ${{ github.workspace }}/data/thief_orienteering
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -25,7 +31,10 @@ jobs:
         python3 -m pip install gdown
         python3 scripts/download_data.py
     - name: Build
-      run: bazel build -- //...
+      run: |
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+        cmake --build build --config Release --parallel
+        cmake --install build --config Release --prefix install
     - name: Run tests
       run: python3 -u scripts/run_tests.py test_results
     - name: Checkout main branch
@@ -34,8 +43,8 @@ jobs:
         git fetch --depth 1
         git checkout master
     - name: Build
-      run: bazel build -- //...
+      run: bazel build -- //travellingthiefsolver/...
     - name: Run tests
       run: python3 -u scripts/run_tests.py test_results_ref
     - name: Process tests
-      run: python3 ./bazel-travellingthiefsolver/external/optimizationtools/scripts/process_tests.py --ref test_results_ref --new test_results
+      run: python3 -u ./build/_deps/optimizationtools-src/scripts/process_tests.py --ref test_results_ref --new test_results
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.15.0)
+
+project(TravellingThiefSolver LANGUAGES CXX)
+
+# Require C++14.
+set(CMAKE_CXX_STANDARD 14)
+
+# Enable output of compile commands during generation.
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# Add sub-directories.
+add_subdirectory(extern)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/README.md b/README.md
@@ -61,7 +61,9 @@ Authors:
 
 Compile:
 ```shell
-bazel build -- //...
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+cmake --build build --config Release --parallel
+cmake --install build --config Release --prefix install
 ```
 
 Download data:
@@ -72,7 +74,7 @@ python3 scripts/download_data.py
 Examples:
 
 ```shell
-./bazel-bin/travellingthiefsolver/travelling_thief/main -v 1 -i "data/travelling_thief/gecco2023/fnl4461_n4460_bounded-strongly-corr_01.ttp" -a "iterative-tsp-pwt-ttp" -t 600
+./install/bin/travellingthiefsolver_travelling_thief  --verbosity-level 1  --input "data/travelling_thief/gecco2023/fnl4461_n4460_bounded-strongly-corr_01.ttp"  --algorithm "iterative-tsp-pwt-ttp"  --time-limit 600
 ```
 ```
 =====================================

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Enable FetchContent.
+include(FetchContent)
+
+# Fetch fontanf/knapsacksolver.
+FetchContent_Declare(
+    knapsacksolver
+    GIT_REPOSITORY https://github.com/fontanf/knapsacksolver.git
+    GIT_TAG abbe052b56c6e985112cda23abda26f1eb0e43ce)
+    #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../knapsacksolver/")
+FetchContent_MakeAvailable(knapsacksolver)
+
+# Fetch fontanf/treesearchsolver.
+FetchContent_Declare(
+    treesearchsolver
+    GIT_REPOSITORY https://github.com/fontanf/treesearchsolver.git
+    GIT_TAG dca5b35d5cb6de3443b9ab08175f931b2df29b6b)
+    #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../treesearchsolver/")
+FetchContent_MakeAvailable(treesearchsolver)
+
+# Fetch fontanf/localsearchsolver.
+FetchContent_Declare(
+    localsearchsolver
+    GIT_REPOSITORY https://github.com/fontanf/localsearchsolver.git
+    GIT_TAG ecb15ef667d107f25ea51d056368f9c4e15545e2)
+    #SOURCE_DIR "${PROJECT_SOURCE_DIR}/../localsearchsolver/")
+FetchContent_MakeAvailable(localsearchsolver)
diff --git a/...er/packing_while_travelling/algorithm.hpp → ...er/packing_while_travelling/algorithm.hpp b/...er/packing_while_travelling/algorithm.hpp → ...er/packing_while_travelling/algorithm.hpp
diff --git a/..._while_travelling/algorithm_formatter.hpp → ..._while_travelling/algorithm_formatter.hpp b/..._while_travelling/algorithm_formatter.hpp → ..._while_travelling/algorithm_formatter.hpp
diff --git a/...elling/algorithms/dynamic_programming.hpp → ...elling/algorithms/dynamic_programming.hpp b/...elling/algorithms/dynamic_programming.hpp → ...elling/algorithms/dynamic_programming.hpp
diff --git a/...ing/algorithms/efficient_local_search.hpp → ...ing/algorithms/efficient_local_search.hpp b/...ing/algorithms/efficient_local_search.hpp → ...ing/algorithms/efficient_local_search.hpp
diff --git a/...ng_while_travelling/algorithms/greedy.hpp → ...ng_while_travelling/algorithms/greedy.hpp b/...ng_while_travelling/algorithms/greedy.hpp → ...ng_while_travelling/algorithms/greedy.hpp
diff --git a/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp b/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp
diff --git a/...lgorithms/sequential_value_correction.hpp → ...lgorithms/sequential_value_correction.hpp b/...lgorithms/sequential_value_correction.hpp → ...lgorithms/sequential_value_correction.hpp
diff --git a/...ver/packing_while_travelling/instance.hpp → ...ver/packing_while_travelling/instance.hpp b/...ver/packing_while_travelling/instance.hpp → ...ver/packing_while_travelling/instance.hpp
diff --git a/...ing_while_travelling/instance_builder.hpp → ...ing_while_travelling/instance_builder.hpp b/...ing_while_travelling/instance_builder.hpp → ...ing_while_travelling/instance_builder.hpp
diff --git a/...er/packing_while_travelling/reduction.hpp → ...er/packing_while_travelling/reduction.hpp b/...er/packing_while_travelling/reduction.hpp → ...er/packing_while_travelling/reduction.hpp
diff --git a/...ver/packing_while_travelling/solution.hpp → ...ver/packing_while_travelling/solution.hpp b/...ver/packing_while_travelling/solution.hpp → ...ver/packing_while_travelling/solution.hpp
diff --git a/...ing_while_travelling/solution_builder.hpp → ...ing_while_travelling/solution_builder.hpp b/...ing_while_travelling/solution_builder.hpp → ...ing_while_travelling/solution_builder.hpp
diff --git a/...solver/packing_while_travelling/utils.hpp → ...solver/packing_while_travelling/utils.hpp b/...solver/packing_while_travelling/utils.hpp → ...solver/packing_while_travelling/utils.hpp
diff --git a/...hief_orienteering/algorithm_formatter.hpp → ...hief_orienteering/algorithm_formatter.hpp b/...hief_orienteering/algorithm_formatter.hpp → ...hief_orienteering/algorithm_formatter.hpp
diff --git a/..._orienteering/algorithms/local_search.hpp → ..._orienteering/algorithms/local_search.hpp b/..._orienteering/algorithms/local_search.hpp → ..._orienteering/algorithms/local_search.hpp
diff --git a/...f_orienteering/algorithms/tree_search.hpp → ...f_orienteering/algorithms/tree_search.hpp b/...f_orienteering/algorithms/tree_search.hpp → ...f_orienteering/algorithms/tree_search.hpp
diff --git a/...iefsolver/thief_orienteering/instance.hpp → ...iefsolver/thief_orienteering/instance.hpp b/...iefsolver/thief_orienteering/instance.hpp → ...iefsolver/thief_orienteering/instance.hpp
diff --git a/...r/thief_orienteering/instance_builder.hpp → ...r/thief_orienteering/instance_builder.hpp b/...r/thief_orienteering/instance_builder.hpp → ...r/thief_orienteering/instance_builder.hpp
diff --git a/...iefsolver/thief_orienteering/solution.hpp → ...iefsolver/thief_orienteering/solution.hpp b/...iefsolver/thief_orienteering/solution.hpp → ...iefsolver/thief_orienteering/solution.hpp
diff --git a/.../travelling_thief/algorithm_formatter.hpp → .../travelling_thief/algorithm_formatter.hpp b/.../travelling_thief/algorithm_formatter.hpp → .../travelling_thief/algorithm_formatter.hpp
diff --git a/...ief/algorithms/efficient_local_search.hpp → ...ief/algorithms/efficient_local_search.hpp b/...ief/algorithms/efficient_local_search.hpp → ...ief/algorithms/efficient_local_search.hpp
diff --git a/...ng_thief/algorithms/iterative_tsp_pwt.hpp → ...ng_thief/algorithms/iterative_tsp_pwt.hpp b/...ng_thief/algorithms/iterative_tsp_pwt.hpp → ...ng_thief/algorithms/iterative_tsp_pwt.hpp
diff --git a/...hief/algorithms/iterative_tsp_pwt_ttp.hpp → ...hief/algorithms/iterative_tsp_pwt_ttp.hpp b/...hief/algorithms/iterative_tsp_pwt_ttp.hpp → ...hief/algorithms/iterative_tsp_pwt_ttp.hpp
diff --git a/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp b/.../algorithms/large_neighborhood_search.hpp → .../algorithms/large_neighborhood_search.hpp
diff --git a/...velling_thief/algorithms/local_search.hpp → ...velling_thief/algorithms/local_search.hpp b/...velling_thief/algorithms/local_search.hpp → ...velling_thief/algorithms/local_search.hpp
diff --git a/...avelling_thief/algorithms/tree_search.hpp → ...avelling_thief/algorithms/tree_search.hpp b/...avelling_thief/algorithms/tree_search.hpp → ...avelling_thief/algorithms/tree_search.hpp
diff --git a/...thiefsolver/travelling_thief/instance.hpp → ...thiefsolver/travelling_thief/instance.hpp b/...thiefsolver/travelling_thief/instance.hpp → ...thiefsolver/travelling_thief/instance.hpp
diff --git a/...ver/travelling_thief/instance_builder.hpp → ...ver/travelling_thief/instance_builder.hpp b/...ver/travelling_thief/instance_builder.hpp → ...ver/travelling_thief/instance_builder.hpp
diff --git a/...thiefsolver/travelling_thief/solution.hpp → ...thiefsolver/travelling_thief/solution.hpp b/...thiefsolver/travelling_thief/solution.hpp → ...thiefsolver/travelling_thief/solution.hpp
diff --git a/...ingthiefsolver/travelling_thief/utils.hpp → ...ingthiefsolver/travelling_thief/utils.hpp b/...ingthiefsolver/travelling_thief/utils.hpp → ...ingthiefsolver/travelling_thief/utils.hpp
diff --git a/...ing_while_packing/algorithm_formatter.hpp → ...ing_while_packing/algorithm_formatter.hpp b/...ing_while_packing/algorithm_formatter.hpp → ...ing_while_packing/algorithm_formatter.hpp
diff --git a/...while_packing/algorithms/local_search.hpp → ...while_packing/algorithms/local_search.hpp b/...while_packing/algorithms/local_search.hpp → ...while_packing/algorithms/local_search.hpp
diff --git a/...ver/travelling_while_packing/instance.hpp → ...ver/travelling_while_packing/instance.hpp b/...ver/travelling_while_packing/instance.hpp → ...ver/travelling_while_packing/instance.hpp
diff --git a/...elling_while_packing/instance_builder.hpp → ...elling_while_packing/instance_builder.hpp b/...elling_while_packing/instance_builder.hpp → ...elling_while_packing/instance_builder.hpp
diff --git a/...ver/travelling_while_packing/solution.hpp → ...ver/travelling_while_packing/solution.hpp b/...ver/travelling_while_packing/solution.hpp → ...ver/travelling_while_packing/solution.hpp
diff --git a/scripts/download_data.py b/scripts/download_data.py
@@ -4,9 +4,16 @@
 
 
 def download(id):
-    gdown.download(id=id, output="data.7z")
-    os.system("7z x data.7z -odata")
-    pathlib.Path("data.7z").unlink()
+    for _ in range(3):
+        try:
+            gdown.download(id=id, output="data.7z")
+            os.system("7z x data.7z -odata")
+            pathlib.Path("data.7z").unlink()
+        except:
+            time.sleep(10)
+            continue
+        return
+    sys.exit(1)
 
 
 download("1RmT19FCH3gnxTi8GRCrI_UUJGSMPUXTT")

diff --git a/scripts/run_tests.py b/scripts/run_tests.py
@@ -14,19 +14,19 @@
 
 
 
+travelling_thief_data = os.environ['TRAVELLING_THIEF_DATA']
 travelling_thief_main = os.path.join(
-        "bazel-bin",
-        "travellingthiefsolver",
-        "travelling_thief",
-        "main")
+        "install",
+        "bin",
+        "travellingthiefsolver_travelling_thief")
 
 
 if args.tests is None or "travelling-thief-local-search" in args.tests:
     print("Travelling thief problem / local search")
     print("---------------------------------------")
     print()
 
-    travelling_thief_local_search_data = [
+    data = [
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n51_bounded-strongly-corr_01.ttp"),
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n51_uncorr_01.ttp"),
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n51_uncorr-similar-weights_01.ttp"),
@@ -36,10 +36,9 @@
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n255_bounded-strongly-corr_01.ttp"),
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n255_uncorr_01.ttp"),
             os.path.join("polyakovskiy2014", "berlin52-ttp", "berlin52_n255_uncorr-similar-weights_01.ttp")]
-    for instance in travelling_thief_local_search_data:
+    for instance in data:
         instance_path = os.path.join(
-                "data",
-                "travelling_thief",
+                travelling_thief_data,
                 instance)
         json_output_path = os.path.join(
                 args.directory,
@@ -67,7 +66,7 @@
     print("--------------------------------------")
     print()
 
-    travelling_thief_tree_search_data = [
+    data = [
             os.path.join("wu2017", "eil51_n14_m13_multiple-strongly-corr_01.ttp"),
             os.path.join("wu2017", "eil51_n14_m13_uncorr_01.ttp"),
             os.path.join("wu2017", "eil51_n14_m13_uncorr-similar-weights_01.ttp"),
@@ -77,10 +76,9 @@
             os.path.join("wu2017", "eil51_n05_m40_multiple-strongly-corr_01.ttp"),
             os.path.join("wu2017", "eil51_n05_m40_uncorr_01.ttp"),
             os.path.join("wu2017", "eil51_n05_m40_uncorr-similar-weights_01.ttp")]
-    for instance in travelling_thief_tree_search_data:
+    for instance in data:
         instance_path = os.path.join(
-                "data",
-                "travelling_thief",
+                travelling_thief_data,
                 instance)
         json_output_path = os.path.join(
                 args.directory,
@@ -102,19 +100,19 @@
     print()
 
 
+thief_orienteering_data = os.environ['THIEF_ORIENTEERING_DATA']
 thief_orienteering_main = os.path.join(
-        "bazel-bin",
-        "travellingthiefsolver",
-        "thief_orienteering",
-        "main")
+        "install",
+        "bin",
+        "travellingthiefsolver_thief_orienteering")
 
 
 if args.tests is None or "thief-orienteering-local-search" in args.tests:
     print("Thief orienteering / local search")
     print("---------------------------------")
     print()
 
-    thief_orienteering_local_search_data = [
+    data = [
             os.path.join("santos2018", "eil51-thop", "eil51_01_bsc_01_01.thop"),
             os.path.join("santos2018", "eil51-thop", "eil51_01_unc_05_01.thop"),
             os.path.join("santos2018", "eil51-thop", "eil51_01_usw_10_01.thop"),
@@ -124,10 +122,9 @@
             os.path.join("santos2018", "eil51-thop", "eil51_05_bsc_10_01.thop"),
             os.path.join("santos2018", "eil51-thop", "eil51_05_unc_01_01.thop"),
             os.path.join("santos2018", "eil51-thop", "eil51_05_usw_05_01.thop")]
-    for instance in thief_orienteering_local_search_data:
+    for instance in data:
         instance_path = os.path.join(
-                "data",
-                "thief_orienteering",
+                thief_orienteering_data,
                 instance)
         json_output_path = os.path.join(
                 args.directory,

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(packing_while_travelling)
+add_subdirectory(thief_orienteering)
+add_subdirectory(travelling_thief)
+add_subdirectory(travelling_while_packing)
diff --git a/src/packing_while_travelling/CMakeLists.txt b/src/packing_while_travelling/CMakeLists.txt
@@ -0,0 +1,31 @@
+add_library(TravellingThiefSolver_packing_while_travelling)
+target_sources(TravellingThiefSolver_packing_while_travelling PRIVATE
+    instance.cpp
+    instance_builder.cpp
+    solution.cpp
+    solution_builder.cpp
+    utils.cpp
+    reduction.cpp
+    algorithm.cpp
+    algorithm_formatter.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling PUBLIC
+    OptimizationTools::containers
+    OptimizationTools::utils)
+add_library(TravellingThiefSolver::knapsack ALIAS TravellingThiefSolver_packing_while_travelling)
+
+add_subdirectory(algorithms)
+
+add_executable(TravellingThiefSolver_packing_while_travelling_main)
+target_sources(TravellingThiefSolver_packing_while_travelling_main PRIVATE
+    main.cpp)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_main PUBLIC
+    TravellingThiefSolver_packing_while_travelling_greedy
+    TravellingThiefSolver_packing_while_travelling_sequential_value_correction
+    TravellingThiefSolver_packing_while_travelling_dynamic_programming
+    TravellingThiefSolver_packing_while_travelling_efficient_local_search
+    TravellingThiefSolver_packing_while_travelling_large_neighborhood_search
+    Boost::program_options)
+set_target_properties(TravellingThiefSolver_packing_while_travelling_main PROPERTIES OUTPUT_NAME "travellingthiefsolver_packing_while_travelling")
+install(TARGETS TravellingThiefSolver_packing_while_travelling_main)
diff --git a/...er/packing_while_travelling/algorithm.cpp → src/packing_while_travelling/algorithm.cpp b/...er/packing_while_travelling/algorithm.cpp → src/packing_while_travelling/algorithm.cpp
diff --git a/..._while_travelling/algorithm_formatter.cpp → ..._while_travelling/algorithm_formatter.cpp b/..._while_travelling/algorithm_formatter.cpp → ..._while_travelling/algorithm_formatter.cpp
diff --git a/src/packing_while_travelling/algorithms/CMakeLists.txt b/src/packing_while_travelling/algorithms/CMakeLists.txt
@@ -0,0 +1,48 @@
+add_library(TravellingThiefSolver_packing_while_travelling_greedy)
+target_sources(TravellingThiefSolver_packing_while_travelling_greedy PRIVATE
+    greedy.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling_greedy PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_greedy PUBLIC
+    TravellingThiefSolver_packing_while_travelling)
+add_library(TravellingThiefSolver::knapsack::greedy ALIAS TravellingThiefSolver_packing_while_travelling_greedy)
+
+add_library(TravellingThiefSolver_packing_while_travelling_sequential_value_correction)
+target_sources(TravellingThiefSolver_packing_while_travelling_sequential_value_correction PRIVATE
+    sequential_value_correction.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling_sequential_value_correction PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_sequential_value_correction PUBLIC
+    TravellingThiefSolver_packing_while_travelling
+    KnapsackSolver::knapsack::dynamic_programming_primal_dual)
+add_library(TravellingThiefSolver::knapsack::sequential_value_correction ALIAS TravellingThiefSolver_packing_while_travelling_sequential_value_correction)
+
+add_library(TravellingThiefSolver_packing_while_travelling_dynamic_programming)
+target_sources(TravellingThiefSolver_packing_while_travelling_dynamic_programming PRIVATE
+    dynamic_programming.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling_dynamic_programming PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_dynamic_programming PUBLIC
+    TravellingThiefSolver_packing_while_travelling)
+add_library(TravellingThiefSolver::knapsack::dynamic_programming ALIAS TravellingThiefSolver_packing_while_travelling_dynamic_programming)
+
+add_library(TravellingThiefSolver_packing_while_travelling_efficient_local_search)
+target_sources(TravellingThiefSolver_packing_while_travelling_efficient_local_search PRIVATE
+    efficient_local_search.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling_efficient_local_search PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_efficient_local_search PUBLIC
+    TravellingThiefSolver_packing_while_travelling
+    TravellingThiefSolver_packing_while_travelling_sequential_value_correction)
+add_library(TravellingThiefSolver::knapsack::efficient_local_search ALIAS TravellingThiefSolver_packing_while_travelling_efficient_local_search)
+
+add_library(TravellingThiefSolver_packing_while_travelling_large_neighborhood_search)
+target_sources(TravellingThiefSolver_packing_while_travelling_large_neighborhood_search PRIVATE
+    large_neighborhood_search.cpp)
+target_include_directories(TravellingThiefSolver_packing_while_travelling_large_neighborhood_search PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_packing_while_travelling_large_neighborhood_search PUBLIC
+    TravellingThiefSolver_packing_while_travelling
+    TravellingThiefSolver_packing_while_travelling_greedy
+    TravellingThiefSolver_packing_while_travelling_sequential_value_correction)
+add_library(TravellingThiefSolver::knapsack::large_neighborhood_search ALIAS TravellingThiefSolver_packing_while_travelling_large_neighborhood_search)
diff --git a/...elling/algorithms/dynamic_programming.cpp → ...elling/algorithms/dynamic_programming.cpp b/...elling/algorithms/dynamic_programming.cpp → ...elling/algorithms/dynamic_programming.cpp
diff --git a/...ing/algorithms/efficient_local_search.cpp → ...ing/algorithms/efficient_local_search.cpp b/...ing/algorithms/efficient_local_search.cpp → ...ing/algorithms/efficient_local_search.cpp
diff --git a/...ng_while_travelling/algorithms/greedy.cpp → ...ng_while_travelling/algorithms/greedy.cpp b/...ng_while_travelling/algorithms/greedy.cpp → ...ng_while_travelling/algorithms/greedy.cpp
diff --git a/.../algorithms/large_neighborhood_search.cpp → .../algorithms/large_neighborhood_search.cpp b/.../algorithms/large_neighborhood_search.cpp → .../algorithms/large_neighborhood_search.cpp
diff --git a/...lgorithms/sequential_value_correction.cpp → ...lgorithms/sequential_value_correction.cpp b/...lgorithms/sequential_value_correction.cpp → ...lgorithms/sequential_value_correction.cpp
diff --git a/...ver/packing_while_travelling/instance.cpp → src/packing_while_travelling/instance.cpp b/...ver/packing_while_travelling/instance.cpp → src/packing_while_travelling/instance.cpp
diff --git a/...ing_while_travelling/instance_builder.cpp → ...ing_while_travelling/instance_builder.cpp b/...ing_while_travelling/instance_builder.cpp → ...ing_while_travelling/instance_builder.cpp
diff --git a/...fsolver/packing_while_travelling/main.cpp → src/packing_while_travelling/main.cpp b/...fsolver/packing_while_travelling/main.cpp → src/packing_while_travelling/main.cpp
diff --git a/...er/packing_while_travelling/reduction.cpp → src/packing_while_travelling/reduction.cpp b/...er/packing_while_travelling/reduction.cpp → src/packing_while_travelling/reduction.cpp
diff --git a/...ver/packing_while_travelling/solution.cpp → src/packing_while_travelling/solution.cpp b/...ver/packing_while_travelling/solution.cpp → src/packing_while_travelling/solution.cpp
diff --git a/...ing_while_travelling/solution_builder.cpp → ...ing_while_travelling/solution_builder.cpp b/...ing_while_travelling/solution_builder.cpp → ...ing_while_travelling/solution_builder.cpp
diff --git a/...solver/packing_while_travelling/utils.cpp → src/packing_while_travelling/utils.cpp b/...solver/packing_while_travelling/utils.cpp → src/packing_while_travelling/utils.cpp
diff --git a/src/thief_orienteering/CMakeLists.txt b/src/thief_orienteering/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_library(TravellingThiefSolver_thief_orienteering)
+target_sources(TravellingThiefSolver_thief_orienteering PRIVATE
+    instance.cpp
+    instance_builder.cpp
+    solution.cpp
+    algorithm_formatter.cpp)
+target_include_directories(TravellingThiefSolver_thief_orienteering PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_thief_orienteering PUBLIC
+    OptimizationTools::utils
+    TravelingSalesmanSolver::distances)
+add_library(TravellingThiefSolver::knapsack ALIAS TravellingThiefSolver_thief_orienteering)
+
+add_subdirectory(algorithms)
+
+add_executable(TravellingThiefSolver_thief_orienteering_main)
+target_sources(TravellingThiefSolver_thief_orienteering_main PRIVATE
+    main.cpp)
+target_link_libraries(TravellingThiefSolver_thief_orienteering_main PUBLIC
+    TravellingThiefSolver_thief_orienteering_tree_search
+    TravellingThiefSolver_thief_orienteering_local_search
+    Boost::program_options)
+set_target_properties(TravellingThiefSolver_thief_orienteering_main PROPERTIES OUTPUT_NAME "travellingthiefsolver_thief_orienteering")
+install(TARGETS TravellingThiefSolver_thief_orienteering_main)
+
+add_executable(TravellingThiefSolver_thief_orienteering_checker)
+target_sources(TravellingThiefSolver_thief_orienteering_checker PRIVATE
+    checker.cpp)
+target_link_libraries(TravellingThiefSolver_thief_orienteering_checker PUBLIC
+    TravellingThiefSolver_thief_orienteering
+    Boost::program_options)
+set_target_properties(TravellingThiefSolver_thief_orienteering_checker PROPERTIES OUTPUT_NAME "travellingthiefsolver_thief_orienteering_checker")
+install(TARGETS TravellingThiefSolver_thief_orienteering_checker)
diff --git a/...hief_orienteering/algorithm_formatter.cpp → ...hief_orienteering/algorithm_formatter.cpp b/...hief_orienteering/algorithm_formatter.cpp → ...hief_orienteering/algorithm_formatter.cpp
diff --git a/src/thief_orienteering/algorithms/CMakeLists.txt b/src/thief_orienteering/algorithms/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(TravellingThiefSolver_thief_orienteering_tree_search)
+target_sources(TravellingThiefSolver_thief_orienteering_tree_search PRIVATE
+    tree_search.cpp)
+target_include_directories(TravellingThiefSolver_thief_orienteering_tree_search PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_thief_orienteering_tree_search PUBLIC
+    TravellingThiefSolver_thief_orienteering
+    TreeSearchSolver::treesearchsolver)
+add_library(TravellingThiefSolver::thief_orienteering::tree_search ALIAS TravellingThiefSolver_thief_orienteering_tree_search)
+
+add_library(TravellingThiefSolver_thief_orienteering_local_search)
+target_sources(TravellingThiefSolver_thief_orienteering_local_search PRIVATE
+    local_search.cpp)
+target_include_directories(TravellingThiefSolver_thief_orienteering_local_search PUBLIC
+    ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(TravellingThiefSolver_thief_orienteering_local_search PUBLIC
+    TravellingThiefSolver_thief_orienteering
+    LocalSearchSolver::localsearchsolver)
+add_library(TravellingThiefSolver::thief_orienteering::local_search ALIAS TravellingThiefSolver_thief_orienteering_local_search)
diff --git a/..._orienteering/algorithms/local_search.cpp → ..._orienteering/algorithms/local_search.cpp b/..._orienteering/algorithms/local_search.cpp → ..._orienteering/algorithms/local_search.cpp
diff --git a/...f_orienteering/algorithms/tree_search.cpp → ...f_orienteering/algorithms/tree_search.cpp b/...f_orienteering/algorithms/tree_search.cpp → ...f_orienteering/algorithms/tree_search.cpp
diff --git a/...hiefsolver/thief_orienteering/checker.cpp → src/thief_orienteering/checker.cpp b/...hiefsolver/thief_orienteering/checker.cpp → src/thief_orienteering/checker.cpp
diff --git a/...iefsolver/thief_orienteering/instance.cpp → src/thief_orienteering/instance.cpp b/...iefsolver/thief_orienteering/instance.cpp → src/thief_orienteering/instance.cpp
diff --git a/...r/thief_orienteering/instance_builder.cpp → src/thief_orienteering/instance_builder.cpp b/...r/thief_orienteering/instance_builder.cpp → src/thief_orienteering/instance_builder.cpp
diff --git a/...ngthiefsolver/thief_orienteering/main.cpp → src/thief_orienteering/main.cpp b/...ngthiefsolver/thief_orienteering/main.cpp → src/thief_orienteering/main.cpp
diff --git a/...iefsolver/thief_orienteering/solution.cpp → src/thief_orienteering/solution.cpp b/...iefsolver/thief_orienteering/solution.cpp → src/thief_orienteering/solution.cpp