Skip to content

Commit 3fadc7c

Browse files
committed
Make linter happy
1 parent fb48b52 commit 3fadc7c

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

highs/mip/HighsSearch.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,8 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
533533

534534
auto strongBranch = [&](bool upbranch) {
535535
int64_t inferences = -(int64_t)localdom.getDomainChangeStack().size() - 1;
536-
HighsBoundType boundtype = upbranch ? HighsBoundType::kLower
537-
: HighsBoundType::kUpper;
536+
HighsBoundType boundtype =
537+
upbranch ? HighsBoundType::kLower : HighsBoundType::kUpper;
538538
double boundval = upbranch ? upval : downval;
539539
HighsDomainChange domchg{boundval, col, boundtype};
540540

@@ -559,8 +559,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
559559

560560
if (upbranch) {
561561
branchDownwards(col, downval, fracval);
562-
}
563-
else {
562+
} else {
564563
branchUpwards(col, upval, fracval);
565564
}
566565
nodestack[nodestack.size() - 2].opensubtrees = 0;
@@ -593,8 +592,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
593592
upscore[candidate] = objdelta;
594593
upscorereliable[candidate] = true;
595594
markBranchingVarUpReliableAtNode(col);
596-
}
597-
else {
595+
} else {
598596
downscore[candidate] = objdelta;
599597
downscorereliable[candidate] = true;
600598
markBranchingVarDownReliableAtNode(col);
@@ -616,8 +614,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
616614
if (lp->unscaledDualFeasible(status)) {
617615
if (upbranch) {
618616
upbound[candidate] = solobj;
619-
}
620-
else {
617+
} else {
621618
downbound[candidate] = solobj;
622619
}
623620
if (solobj > mipsolver.mipdata_->optimality_limit) {
@@ -631,8 +628,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
631628

632629
if (upbranch) {
633630
branchDownwards(col, downval, fracval);
634-
}
635-
else {
631+
} else {
636632
branchUpwards(col, upval, fracval);
637633
}
638634
nodestack[nodestack.size() - 2].opensubtrees = pruned ? 0 : 1;
@@ -652,8 +648,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
652648

653649
if (upbranch) {
654650
branchDownwards(col, downval, fracval);
655-
}
656-
else {
651+
} else {
657652
branchUpwards(col, upval, fracval);
658653
}
659654
nodestack[nodestack.size() - 2].opensubtrees = 0;
@@ -672,8 +667,7 @@ HighsInt HighsSearch::selectBranchingCandidate(int64_t maxSbIters,
672667

673668
if (upbranch) {
674669
branchDownwards(col, downval, fracval);
675-
}
676-
else {
670+
} else {
677671
branchUpwards(col, upval, fracval);
678672
}
679673
nodestack[nodestack.size() - 2].opensubtrees = 0;

0 commit comments

Comments
 (0)