Skip to content

Commit 99432f9

Browse files
committed
Fix linting issues. Actually fixed the unit test (0 is also an invalid enum value)
1 parent 1ba4513 commit 99432f9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

check/TestCAPI.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static void userCallback(const int callback_type, const char* message,
126126
printf("userCallback(%11.4g): improving solution with objective = %g\n",
127127
local_callback_data, objective_function_value);
128128
// Now test all more simply
129-
checkGetCallbackDataOutInt(data_out, kHighsCallbackDataOutLogTypeName, 0);
129+
checkGetCallbackDataOutInt(data_out, kHighsCallbackDataOutLogTypeName, 1);
130130
checkGetCallbackDataOutDouble(
131131
data_out, kHighsCallbackDataOutRunningTimeName, data_out->running_time);
132132
checkGetCallbackDataOutHighsInt(

src/lp_data/HighsCallback.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct HighsCallbackDataOut {
5050
std::vector<double> cutpool_lower;
5151
std::vector<double> cutpool_upper;
5252
userMipSolutionCallbackOrigin user_solution_callback_origin;
53-
53+
5454
operator HighsCCallbackDataOut() const;
5555
};
5656

src/mip/HighsMipSolverData.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,8 @@ struct HighsMipSolverData {
290290
bool interruptFromCallbackWithData(const int callback_type,
291291
const double mipsolver_objective_value,
292292
const std::string message = "") const;
293-
void callbackUserSolution(const double mipsolver_objective_value,
293+
void callbackUserSolution(
294+
const double mipsolver_objective_value,
294295
const userMipSolutionCallbackOrigin user_solution_callback_origin);
295296
};
296297

0 commit comments

Comments
 (0)