Skip to content

Commit d8d4964

Browse files
committed
Formatted
1 parent acff466 commit d8d4964

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

highs/interfaces/highs_c_api.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,13 +1171,13 @@ HighsInt Highs_getPresolvedNumNz(const void* highs) {
11711171
// Gets pointers to all the public data members of HighsLp: avoids
11721172
// duplicate code in Highs_getModel, Highs_getPresolvedLp,
11731173
static HighsInt Highs_getHighsLpData(const HighsLp& lp, const HighsInt a_format,
1174-
HighsInt* num_col, HighsInt* num_row,
1175-
HighsInt* num_nz, HighsInt* sense, double* offset,
1176-
double* col_cost, double* col_lower,
1177-
double* col_upper, double* row_lower,
1178-
double* row_upper, HighsInt* a_start,
1179-
HighsInt* a_index, double* a_value,
1180-
HighsInt* integrality) {
1174+
HighsInt* num_col, HighsInt* num_row,
1175+
HighsInt* num_nz, HighsInt* sense,
1176+
double* offset, double* col_cost,
1177+
double* col_lower, double* col_upper,
1178+
double* row_lower, double* row_upper,
1179+
HighsInt* a_start, HighsInt* a_index,
1180+
double* a_value, HighsInt* integrality) {
11811181
const MatrixFormat desired_a_format =
11821182
a_format == HighsInt(MatrixFormat::kColwise) ? MatrixFormat::kColwise
11831183
: MatrixFormat::kRowwise;

highs/mip/HighsImplications.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ void HighsImplications::addVUB(HighsInt col, HighsInt vubcol, double vubcoef,
415415
currentvub.coef = vubcoef;
416416
currentvub.constant = vubconstant;
417417
}
418-
}
419-
else numVarBounds++;
418+
} else
419+
numVarBounds++;
420420
}
421421

422422
void HighsImplications::addVLB(HighsInt col, HighsInt vlbcol, double vlbcoef,
@@ -445,8 +445,8 @@ void HighsImplications::addVLB(HighsInt col, HighsInt vlbcol, double vlbcoef,
445445
currentvlb.coef = vlbcoef;
446446
currentvlb.constant = vlbconstant;
447447
}
448-
}
449-
else numVarBounds++;
448+
} else
449+
numVarBounds++;
450450
}
451451

452452
void HighsImplications::rebuild(HighsInt ncols,

highs/mip/HighsPrimalHeuristics.cpp

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

0 commit comments

Comments
 (0)