Skip to content

Constraint Reordering: Reverse Bland Heuristic #641

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

Open
mbaranr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Constraint Reordering: Reverse Bland Heuristic #641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/tsolvers/lasolver/LASolver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@ TRes LASolver::cutFromProof() {
auto isOnUpperBound = [this](LVRef var) { return simplex.hasUBound(var) and not simplex.isModelStrictlyUnderUpperBound(var); };
// Step 1: Gather defining constraints
std::vector<DefiningConstraint> constraints;
std::vector<DefiningConstraint> equalities;
for (LVRef var : int_vars) {
bool isOnLower = isOnLowerBound(var);
bool isOnUpper = isOnUpperBound(var);
Expand All @@ -924,13 +925,16 @@ TRes LASolver::cutFromProof() {
auto const & rhs = val.R();
assert(rhs.isInteger());
if (isOnLower and isOnUpper) {
constraints.insert(constraints.begin(), DefiningConstraint{term, rhs});
equalities.push_back(DefiningConstraint{term, rhs});
} else {
constraints.push_back(DefiningConstraint{term, rhs});
}

// std::cout << logic.pp(term) << " = " << rhs << std::endl;
}
for (DefiningConstraint & constraint : equalities) {
constraints.push_back(std::move(constraint));
}
std::reverse(constraints.begin(), constraints.end());

auto getVarValue = [this](PTRef var) {
assert(this->logic.isVar(var));
LVRef lvar = this->laVarMapper.getVarByPTId(logic.getPterm(var).getId());
Expand Down