Skip to content
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

Jump to bottom

issue1088 #156

Merged
merged 7 commits into from
Jul 6, 2023
Merged

issue1088 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c7edd2
Assert that LP constraints contain every variable at most once.
ClemensBuechner Jun 27, 2023
e872120
Use unordered_set.
ClemensBuechner Jun 27, 2023
85c62cc
Add experiment.
ClemensBuechner Jun 27, 2023
c8a43a1
Move function to utils.
ClemensBuechner Jun 27, 2023
c29ae0f
Remove unused import.
ClemensBuechner Jun 27, 2023
215b410
Remove experiments to prepare for merging.
ClemensBuechner Jun 28, 2023
40b20f2
Adapt function declaration to match similar utility functions.
ClemensBuechner Jun 28, 2023
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
3 changes: 3 additions & 0 deletions src/search/lp/lp_solver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "lp_internals.h"

#include "../plugins/plugin.h"
#include "../utils/collections.h"
#include "../utils/logging.h"
#include "../utils/system.h"

Expand Down Expand Up @@ -185,6 +186,7 @@ void LPSolver::load_problem(const LinearProgram &lp) {

for (const LPConstraint &constraint : lp.get_constraints()) {
const vector<int> &vars = constraint.get_variables();
assert(utils::all_values_unique(vars));
const vector<double> &coeffs = constraint.get_coefficients();
assert(vars.size() == coeffs.size());
starts.push_back(elements.size());
Expand Down Expand Up @@ -272,6 +274,7 @@ void LPSolver::add_temporary_constraints(const vector<LPConstraint> &constraints
clear_temporary_data();
int num_rows = constraints.size();
for (const LPConstraint &constraint : constraints) {
assert(utils::all_values_unique(constraint.get_variables()));
row_lb.push_back(constraint.get_lower_bound());
row_ub.push_back(constraint.get_upper_bound());
rows.push_back(new CoinShallowPackedVector(
Expand Down
6 changes: 6 additions & 0 deletions src/search/utils/collections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ extern bool is_sorted_unique(const std::vector<T> &values) {
return true;
}

template<class T>
extern bool all_values_unique(const std::vector<T> &v) {
std::unordered_set<T> s(v.begin(), v.end());
return s.size() == v.size();
}

template<class T>
bool in_bounds(int index, const T &container) {
return index >= 0 && static_cast<size_t>(index) < container.size();
Expand Down