Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions highs/mip/HighsDomain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ static inline double boundRange(double upper_bound, double lower_bound,
double tolerance, HighsVarType var_type) {
double range = upper_bound - lower_bound;
return range - (var_type == HighsVarType::kContinuous
? std::max(0.3 * range, 1000.0 * tolerance)
? std::max(HighsDomain::cont_boundchg_threshold * range,
1000.0 * tolerance)
: tolerance);
}

Expand Down Expand Up @@ -1353,7 +1354,7 @@ double HighsDomain::adjustedUb(HighsInt col, HighsCDouble boundVal,
else
relativeImprove /=
std::max(std::fabs(col_upper_[col]), std::fabs(bound));
accept = relativeImprove >= 0.3;
accept = relativeImprove >= cont_boundchg_threshold;
} else
accept = false;
}
Expand Down Expand Up @@ -1385,7 +1386,7 @@ double HighsDomain::adjustedLb(HighsInt col, HighsCDouble boundVal,
else
relativeImprove /=
std::max(std::fabs(col_lower_[col]), std::fabs(bound));
accept = relativeImprove >= 0.3;
accept = relativeImprove >= cont_boundchg_threshold;
} else
accept = false;
}
Expand Down
2 changes: 2 additions & 0 deletions highs/mip/HighsDomain.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ class HighsDomain {
std::vector<double> col_lower_;
std::vector<double> col_upper_;

static constexpr double cont_boundchg_threshold = 0.2;

HighsDomain(HighsMipSolver& mipsolver);

HighsDomain(const HighsDomain& other)
Expand Down
2 changes: 1 addition & 1 deletion highs/mip/HighsSearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ HighsSearch::NodeResult HighsSearch::branch() {
}
}

double degeneracyFac = lp->computeLPDegneracy(localdom);
double degeneracyFac = std::min(10.0, lp->computeLPDegneracy(localdom));
pseudocost.setDegeneracyFactor(degeneracyFac);
if (degeneracyFac >= 10.0) pseudocost.setMinReliable(0);
// if (!mipsolver.submip)
Expand Down
Loading