Skip to content

Commit 1ba4513

Browse files
committed
Fixed formatting issues and unit test (-1 is not a valid enum value).
1 parent 039cc22 commit 1ba4513

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
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, -1);
129+
checkGetCallbackDataOutInt(data_out, kHighsCallbackDataOutLogTypeName, 0);
130130
checkGetCallbackDataOutDouble(
131131
data_out, kHighsCallbackDataOutRunningTimeName, data_out->running_time);
132132
checkGetCallbackDataOutHighsInt(

src/lp_data/Highs.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2226,19 +2226,19 @@ HighsStatus Highs::setCallback(HighsCallbackFunctionType user_callback,
22262226
HighsStatus Highs::setCallback(HighsCCallbackType c_callback,
22272227
void* user_callback_data) {
22282228
this->callback_.clear();
2229-
this->callback_.user_callback =
2230-
[c_callback](int a, const std::string& b, const HighsCallbackDataOut* cb_out,
2231-
HighsCallbackDataIn* cb_in,
2232-
void* e) {
2233-
HighsCCallbackDataOut cc_out = static_cast<HighsCCallbackDataOut>(*cb_out);
2234-
HighsCCallbackDataIn cc_in;
2235-
cc_in.user_interrupt = 0;
2236-
cc_in.user_solution_size = 0;
2237-
cc_in.user_solution = nullptr;
2238-
2239-
c_callback(a, b.c_str(), &cc_out, &cc_in, e);
2240-
*cb_in = cc_in; // copy the data in
2241-
};
2229+
this->callback_.user_callback = [c_callback](
2230+
int a, const std::string& b,
2231+
const HighsCallbackDataOut* cb_out,
2232+
HighsCallbackDataIn* cb_in, void* e) {
2233+
HighsCCallbackDataOut cc_out = static_cast<HighsCCallbackDataOut>(*cb_out);
2234+
HighsCCallbackDataIn cc_in;
2235+
cc_in.user_interrupt = 0;
2236+
cc_in.user_solution_size = 0;
2237+
cc_in.user_solution = nullptr;
2238+
2239+
c_callback(a, b.c_str(), &cc_out, &cc_in, e);
2240+
*cb_in = cc_in; // copy the data in
2241+
};
22422242
this->callback_.user_callback_data = user_callback_data;
22432243

22442244
options_.log_options.user_callback = this->callback_.user_callback;

src/mip/HighsMipSolverData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2504,7 +2504,7 @@ void HighsMipSolverData::callbackUserSolution(
25042504
assert(!interrupt);
25052505
if (mipsolver.callback_->data_in.user_solution.size() ==
25062506
mipsolver.orig_model_->num_col_) {
2507-
const std::vector<double>& user_solution = mipsolver.callback_->data_in.user_solution;
2507+
const auto& user_solution = mipsolver.callback_->data_in.user_solution;
25082508
double bound_violation_ = 0;
25092509
double row_violation_ = 0;
25102510
double integrality_violation_ = 0;

0 commit comments

Comments
 (0)