From e0958179d416803e272c632defacc15304e37d3a Mon Sep 17 00:00:00 2001 From: Florian Fontan Date: Sun, 8 Dec 2024 00:26:17 +0100 Subject: [PATCH 1/2] Add missing Threads::Threads dependency in CMakeLists.txt --- src/knapsack/algorithms/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/knapsack/algorithms/CMakeLists.txt b/src/knapsack/algorithms/CMakeLists.txt index 53bde69d..b1ef107f 100644 --- a/src/knapsack/algorithms/CMakeLists.txt +++ b/src/knapsack/algorithms/CMakeLists.txt @@ -16,6 +16,7 @@ target_link_libraries(KnapsackSolver_knapsack_greedy PUBLIC KnapsackSolver_knapsack) add_library(KnapsackSolver::knapsack::greedy ALIAS KnapsackSolver_knapsack_greedy) +find_package(Threads) add_library(KnapsackSolver_knapsack_dynamic_programming_bellman) target_sources(KnapsackSolver_knapsack_dynamic_programming_bellman PRIVATE dynamic_programming_bellman.cpp) @@ -24,7 +25,8 @@ target_include_directories(KnapsackSolver_knapsack_dynamic_programming_bellman P target_link_libraries(KnapsackSolver_knapsack_dynamic_programming_bellman PUBLIC KnapsackSolver_knapsack KnapsackSolver_knapsack_upper_bound_dantzig - KnapsackSolver_knapsack_greedy) + KnapsackSolver_knapsack_greedy + Threads::Threads) add_library(KnapsackSolver::knapsack::dynamic_programming_bellman ALIAS KnapsackSolver_knapsack_dynamic_programming_bellman) add_library(KnapsackSolver_knapsack_dynamic_programming_primal_dual) From 3908b185b52053052e5f48125b1f9b027c04f0aa Mon Sep 17 00:00:00 2001 From: Florian Fontan Date: Sun, 8 Dec 2024 00:35:42 +0100 Subject: [PATCH 2/2] Fix dead links in README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 83c98566..eb985fa0 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,10 @@ And therefore, having efficient algorithms with reliable implementations to solv The goal of this repository is to provide such efficient and reliable implementations. Here are some usage examples of this library: -* [Lifting the length of a bin in a 3D packing problem](https://github.com/fontanf/packingsolver/blob/dev_2/packingsolver/boxstacks/branching_scheme.cpp#L67) -* [Solving a 0-1 knapsack subproblem inside an algorithm for a geometrical variable-sized bin packing problem](https://github.com/fontanf/packingsolver/blob/dev_2/packingsolver/algorithms/dichotomic_search.hpp#L135) -* Solving the pricing problem inside a column generation algorithm for the [cutting stock problem](https://github.com/fontanf/columngenerationsolver/blob/main/examples/multipleknapsack.hpp#L157), the [multiple knapsack problem](https://github.com/fontanf/columngenerationsolver/blob/main/examples/cuttingstock.hpp#L123), or the [genralized assignment problem](https://github.com/fontanf/generalizedassignmentsolver/blob/master/generalizedassignmentsolver/algorithms/column_generation.cpp#L181) -* [Solving a 0-1 knapsack subproblem inside an algorithm for the packing while travelling problem](https://github.com/fontanf/travellingthiefsolver/blob/master/travellingthiefsolver/packingwhiletravelling/algorithms/sequential_value_correction.cpp#L19) +* [Lifting the length of a bin in a 3D packing problem](https://github.com/fontanf/packingsolver/blob/2cddb90686fb4a0e92f4ee1b4335ceaa2048d2f4/src/boxstacks/branching_scheme.cpp#L272) +* [Solving a 0-1 knapsack subproblem inside an algorithm for a geometrical variable-sized bin packing problem](https://github.com/fontanf/packingsolver/blob/2cddb90686fb4a0e92f4ee1b4335ceaa2048d2f4/src/algorithms/dichotomic_search.hpp#L149) +* Solving the pricing problem inside a column generation algorithm for the [cutting stock problem](https://github.com/fontanf/columngenerationsolver/blob/096802d9e20d2826aed5b44e3b68ac9df6b20da2/include/columngenerationsolver/examples/cutting_stock.hpp#L123), the [multiple knapsack problem](https://github.com/fontanf/columngenerationsolver/blob/096802d9e20d2826aed5b44e3b68ac9df6b20da2/include/columngenerationsolver/examples/multiple_knapsack.hpp#L154), or the [genralized assignment problem](https://github.com/fontanf/generalizedassignmentsolver/blob/68be0ab77efd897fd583f1031dd6cbc946b33f5a/src/algorithms/column_generation.cpp#L177) +* [Solving a 0-1 knapsack subproblem inside an algorithm for the packing while travelling problem](https://github.com/fontanf/travellingthiefsolver/blob/ce1b6805e8aee8ee3300fbbc97dbc9153eecff01/src/packing_while_travelling/algorithms/sequential_value_correction.cpp#L19) ## Implemented algorithms