Skip to content

Commit

Permalink
Nullified changes due to clang-format version
Browse files Browse the repository at this point in the history
  • Loading branch information
jajhall committed Sep 11, 2024
1 parent 5aba249 commit ad72151
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/lp_data/HighsSolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,10 @@ HighsStatus solveLp(HighsLpSolverObject& solver_object, const string message) {
"Inconsistent solution returned from solver\n");
return HighsStatus::kError;
}
} // options.run_crossover == kHighsOnString
} // unwelcome_ipx_status
}
// options.run_crossover == kHighsOnString
}
// unwelcome_ipx_status
} else {
// PDLP has been used, so check whether claim of optimality
// satisfies the HiGHS criteria
Expand Down
6 changes: 4 additions & 2 deletions src/test/DevKkt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,12 @@ void checkComplementarySlackness(const State& state,
if (fabs(state.colDual[i]) > tol &&
fabs(state.colValue[i] - state.colUpper[i]) > tol) {
if (dev_print)
std::cout << "Comp. slackness fail: " << "l[" << i
<< "]=" << state.colLower[i] << ", x[" << i
// clang-format off
std::cout << "Comp. slackness fail: "
<< "l[" << i << "]=" << state.colLower[i] << ", x[" << i
<< "]=" << state.colValue[i] << ", z[" << i
<< "]=" << state.colDual[i] << std::endl;
// clang-format on
infeas = fabs(state.colDual[i]);
}
}
Expand Down

0 comments on commit ad72151

Please sign in to comment.