Skip to content

Commit e537564

Browse files
author
jajhall
committed
Formatted
1 parent b5c7dc5 commit e537564

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

check/TestCallbacks.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ HighsCallbackFunctionType userkMipUserSetPartialSolution =
254254
std::vector<HighsInt> index;
255255
std::vector<double> value;
256256

257-
for (HighsInt i = 0; i < static_cast<HighsInt>(callback_data.optimal_solution.size()); i++) {
257+
for (HighsInt i = 0;
258+
i < static_cast<HighsInt>(callback_data.optimal_solution.size());
259+
i++) {
258260
if (i % 2 == 0) {
259261
index.push_back(i);
260262
value.push_back(callback_data.optimal_solution[i]);

highs/model/HighsHessianUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ HighsStatus assessHessian(HighsHessian& hessian, const HighsOptions& options) {
5656
// Transform the Hessian to pure column-wise lower triangle format
5757
call_status = normaliseHessian(options, hessian);
5858
return_status = interpretCallStatus(options.log_options, call_status,
59-
return_status, "normaliseHessian");
59+
return_status, "normaliseHessian");
6060
if (return_status == HighsStatus::kError) return return_status;
6161
// Assess values in Q
6262
call_status =
@@ -309,7 +309,7 @@ void triangularToSquareHessian(const HighsHessian& hessian,
309309
}
310310

311311
HighsStatus normaliseHessian(const HighsOptions& options,
312-
HighsHessian& hessian) {
312+
HighsHessian& hessian) {
313313
HighsInt dim = hessian.dim_;
314314
const bool triangular = hessian.format_ == HessianFormat::kTriangular;
315315
const bool square = !triangular;

highs/model/HighsHessianUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void completeHessianDiagonal(const HighsOptions& options,
3030
bool okHessianDiagonal(const HighsOptions& options, HighsHessian& hessian,
3131
const ObjSense sense = ObjSense::kMinimize);
3232
HighsStatus normaliseHessian(const HighsOptions& options,
33-
HighsHessian& hessian);
33+
HighsHessian& hessian);
3434
HighsStatus extractTriangularHessian(const HighsOptions& options,
3535
HighsHessian& hessian);
3636
void triangularToSquareHessian(const HighsHessian& hessian,

0 commit comments

Comments
 (0)