Skip to content

Dev #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fontanf merged 2 commits into from
Feb 2, 2025
Merged

Dev #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a559c5d
Clean code
fontanf Feb 2, 2025
41b269f
Add array in output of subset sum dynamic programming Bellman algorithms
fontanf Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/knapsacksolver/knapsack/algorithms/dynamic_programming_bellman.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ namespace knapsacksolver
namespace knapsack
{

const Output dynamic_programming_bellman_rec(
Output dynamic_programming_bellman_rec(
const Instance& instance,
const Parameters& parameters = {});


const Output dynamic_programming_bellman_array(
Output dynamic_programming_bellman_array(
const Instance& instance,
const Parameters& parameters = {});


const Output dynamic_programming_bellman_array_parallel(
Output dynamic_programming_bellman_array_parallel(
const Instance& instance,
const Parameters& parameters = {});


const Output dynamic_programming_bellman_array_all(
Output dynamic_programming_bellman_array_all(
const Instance& instance,
const Parameters& parameters = {});

Expand Down Expand Up @@ -121,7 +121,7 @@ const DynamicProgrammingBellmanArrayPartOutput dynamic_programming_bellman_array
const DynamicProgrammingBellmanArrayPartParameters& parameters = {});


const Output dynamic_programming_bellman_array_rec(
Output dynamic_programming_bellman_array_rec(
const Instance& instance,
const Parameters& parameters = {});

Expand Down Expand Up @@ -152,7 +152,7 @@ struct DynamicProgrammingBellmanListParameters: Parameters
}
};

const Output dynamic_programming_bellman_list(
Output dynamic_programming_bellman_list(
const Instance& instance,
const DynamicProgrammingBellmanListParameters& parameters = {});

Expand Down
4 changes: 2 additions & 2 deletions include/knapsacksolver/knapsack/algorithms/greedy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace knapsacksolver
namespace knapsack
{

const Output trivial(
Output trivial(
const Instance& instance,
const Parameters& parameters = {});

Expand Down Expand Up @@ -44,7 +44,7 @@ struct GreedyParameters: Parameters
}
};

const Output greedy(
Output greedy(
const Instance& instance,
const GreedyParameters& parameters = {});

Expand Down
2 changes: 1 addition & 1 deletion include/knapsacksolver/knapsack/algorithms/surrogate_relaxation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct SurrogateRelaxationParameters: Parameters
SolveCallback solve_callback = [](const Instance& instance) { return Output(instance); };
};

const Output surrogate_relaxation(
Output surrogate_relaxation(
const Instance& instance,
const SurrogateRelaxationParameters& parameters = {});

Expand Down
2 changes: 1 addition & 1 deletion include/knapsacksolver/knapsack/algorithms/upper_bound_dantzig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct UpperBoundDantzigParameters: Parameters
}
};

const Output upper_bound_dantzig(
Output upper_bound_dantzig(
const Instance& instance,
const UpperBoundDantzigParameters& parameters = {});

Expand Down
6 changes: 3 additions & 3 deletions include/knapsacksolver/multiple_choice_subset_sum/algorithms/dynamic_programming_bellman.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ namespace knapsacksolver
namespace multiple_choice_subset_sum
{

const Output dynamic_programming_bellman_array(
Output dynamic_programming_bellman_array(
const Instance& instance,
const Parameters& parameters = {});

const Output dynamic_programming_bellman_word_ram(
Output dynamic_programming_bellman_word_ram(
const Instance& instance,
const Parameters& parameters = {});

const Output dynamic_programming_bellman_word_ram_rec(
Output dynamic_programming_bellman_word_ram_rec(
const Instance& instance,
const Parameters& parameters = {});

Expand Down
2 changes: 1 addition & 1 deletion include/knapsacksolver/subset_sum/algorithms/dynamic_programming_balancing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace knapsacksolver
namespace subset_sum
{

const Output dynamic_programming_balancing_array(
Output dynamic_programming_balancing_array(
const Instance& instance,
const Parameters& parameters = {});

Expand Down
41 changes: 36 additions & 5 deletions include/knapsacksolver/subset_sum/algorithms/dynamic_programming_bellman.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,53 @@ namespace knapsacksolver
namespace subset_sum
{

const Output dynamic_programming_bellman_array(
struct DynamicProgrammingBellmanArrayOutput: public Output
{
/** Constructor. */
DynamicProgrammingBellmanArrayOutput(const Instance& instance):
Output(instance)
{ }

std::vector<ItemId> values;

bool is_reachable(Weight weight) const
{
return values[weight] != -1;
}
};

DynamicProgrammingBellmanArrayOutput dynamic_programming_bellman_array(
const Instance& instance,
const Parameters& parameters = {});

const Output dynamic_programming_bellman_list(
Output dynamic_programming_bellman_list(
const Instance& instance,
const Parameters& parameters = {});

const Output dynamic_programming_bellman_word_ram(
struct DynamicProgrammingBellmanWordRamOutput: public Output
{
/** Constructor. */
DynamicProgrammingBellmanWordRamOutput(const Instance& instance):
Output(instance)
{ }

std::vector<uint64_t> values;

bool is_reachable(Weight weight) const
{
Weight word = weight / 64;
int bit = weight % 64;
return (values[word] >> bit);
}
};

DynamicProgrammingBellmanWordRamOutput dynamic_programming_bellman_word_ram(
const Instance& instance,
const Parameters& parameters = {});

const Output dynamic_programming_bellman_word_ram_rec(
Output dynamic_programming_bellman_word_ram_rec(
const Instance& instance,
const Parameters& parameters = {});

}
}

12 changes: 6 additions & 6 deletions src/knapsack/algorithms/dynamic_programming_bellman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using namespace knapsacksolver::knapsack;
////////////////////// dynamic_programming_bellman_array ///////////////////////
////////////////////////////////////////////////////////////////////////////////

const Output knapsacksolver::knapsack::dynamic_programming_bellman_array(
Output knapsacksolver::knapsack::dynamic_programming_bellman_array(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -93,7 +93,7 @@ void dynamic_programming_bellman_array_parallel_worker(
}
}

const Output knapsacksolver::knapsack::dynamic_programming_bellman_array_parallel(
Output knapsacksolver::knapsack::dynamic_programming_bellman_array_parallel(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -222,7 +222,7 @@ Profit dynamic_programming_bellman_rec_rec(
return values[state_id];
}

const Output knapsacksolver::knapsack::dynamic_programming_bellman_rec(
Output knapsacksolver::knapsack::dynamic_programming_bellman_rec(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -281,7 +281,7 @@ const Output knapsacksolver::knapsack::dynamic_programming_bellman_rec(
//////////////////// dynamic_programming_bellman_array_all /////////////////////
////////////////////////////////////////////////////////////////////////////////

const Output knapsacksolver::knapsack::dynamic_programming_bellman_array_all(
Output knapsacksolver::knapsack::dynamic_programming_bellman_array_all(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -727,7 +727,7 @@ void dynamic_programming_bellman_array_rec_rec(
}
}

const Output knapsacksolver::knapsack::dynamic_programming_bellman_array_rec(
Output knapsacksolver::knapsack::dynamic_programming_bellman_array_rec(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -804,7 +804,7 @@ std::ostream& operator<<(std::ostream& os, const std::vector<BellmanState>& l)
return os;
}

const Output knapsacksolver::knapsack::dynamic_programming_bellman_list(
Output knapsacksolver::knapsack::dynamic_programming_bellman_list(
const Instance& instance,
const DynamicProgrammingBellmanListParameters& parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion src/knapsack/algorithms/greedy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using namespace knapsacksolver::knapsack;

const Output knapsacksolver::knapsack::greedy(
Output knapsacksolver::knapsack::greedy(
const Instance& instance,
const GreedyParameters& parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion src/knapsack/algorithms/surrogate_relaxation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ UBS surrogate_solve(
return {ub, s_best};
}

const Output knapsacksolver::knapsack::surrogate_relaxation(
Output knapsacksolver::knapsack::surrogate_relaxation(
const Instance& instance,
const SurrogateRelaxationParameters& parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion src/knapsack/algorithms/upper_bound_dantzig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using namespace knapsacksolver::knapsack;

const Output knapsacksolver::knapsack::upper_bound_dantzig(
Output knapsacksolver::knapsack::upper_bound_dantzig(
const Instance& instance,
const UpperBoundDantzigParameters& parameters)
{
Expand Down
6 changes: 3 additions & 3 deletions src/multiple_choice_subset_sum/algorithms/dynamic_programming_bellman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using namespace knapsacksolver::multiple_choice_subset_sum;
////////////////////// dynamic_programming_bellman_array ///////////////////////
////////////////////////////////////////////////////////////////////////////////

const Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_array(
Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_array(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -98,7 +98,7 @@ const Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bel
///////////////////// dynamic_programming_bellman_word_ram /////////////////////
////////////////////////////////////////////////////////////////////////////////

const Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_word_ram(
Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_word_ram(
const Instance& instance,
const Parameters& parameters)
{
Expand Down Expand Up @@ -377,7 +377,7 @@ void dynamic_programming_bellman_word_ram_rec_rec(
}
}

const Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_word_ram_rec(
Output knapsacksolver::multiple_choice_subset_sum::dynamic_programming_bellman_word_ram_rec(
const Instance& instance,
const Parameters& parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion src/subset_sum/algorithms/dynamic_programming_balancing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using namespace knapsacksolver::subset_sum;
///////////////////// dynamic_programming_balancing_array //////////////////////
////////////////////////////////////////////////////////////////////////////////

const Output knapsacksolver::subset_sum::dynamic_programming_balancing_array(
Output knapsacksolver::subset_sum::dynamic_programming_balancing_array(
const Instance& instance,
const Parameters& parameters)
{
Expand Down
Loading
Loading