Skip to content

Commit 4a5d71a

Browse files
committed
Change adjustment rate to use fixingrate
1 parent b3b21ef commit 4a5d71a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

highs/mip/HighsImplications.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class HighsImplications {
6666
nextCleanupCall = mipsolver.numNonzero();
6767
numImplications = 0;
6868
numVarBounds = 0;
69-
maxVarBounds = 2000000 + 10 * numcol;
69+
maxVarBounds = 5000000 + 10 * numcol;
7070
}
7171

7272
std::function<void(HighsInt, HighsInt, HighsInt, double)>
@@ -89,7 +89,7 @@ class HighsImplications {
8989
vlbs.shrink_to_fit();
9090
vlbs.resize(numcol);
9191
numVarBounds = 0;
92-
maxVarBounds = 2000000 + 10 * numcol;
92+
maxVarBounds = 5000000 + 10 * numcol;
9393

9494
nextCleanupCall = mipsolver.numNonzero();
9595
}

highs/mip/HighsPrimalHeuristics.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ bool HighsPrimalHeuristics::solveSubMip(
155155
if (submipsolver.mipdata_) {
156156
double numUnfixed = mipsolver.mipdata_->integral_cols.size() +
157157
mipsolver.mipdata_->continuous_cols.size();
158-
double adjustmentfactor = submipsolver.numCol() / std::max(1.0, numUnfixed);
158+
double adjustmentfactor = ((1 - fixingRate) *
159+
mipsolver.mipdata_->integral_cols.size() +
160+
mipsolver.mipdata_->continuous_cols.size()) / std::max(1.0, numUnfixed);
159161
// (double)mipsolver.orig_model_->a_matrix_.value_.size();
160162
int64_t adjusted_lp_iterations =
161163
(size_t)(adjustmentfactor * submipsolver.mipdata_->total_lp_iterations);

0 commit comments

Comments
 (0)