Skip to content

Commit fc43b6f

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

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(

highs/lp_data/Highs.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,19 +2260,19 @@ HighsStatus Highs::setCallback(HighsCallbackFunctionType user_callback,
22602260
HighsStatus Highs::setCallback(HighsCCallbackType c_callback,
22612261
void* user_callback_data) {
22622262
this->callback_.clear();
2263-
this->callback_.user_callback =
2264-
[c_callback](int a, const std::string& b, const HighsCallbackDataOut* cb_out,
2265-
HighsCallbackDataIn* cb_in,
2266-
void* e) {
2267-
HighsCCallbackDataOut cc_out = static_cast<HighsCCallbackDataOut>(*cb_out);
2268-
HighsCCallbackDataIn cc_in;
2269-
cc_in.user_interrupt = 0;
2270-
cc_in.user_solution_size = 0;
2271-
cc_in.user_solution = nullptr;
2272-
2273-
c_callback(a, b.c_str(), &cc_out, &cc_in, e);
2274-
*cb_in = cc_in; // copy the data in
2275-
};
2263+
this->callback_.user_callback = [c_callback](
2264+
int a, const std::string& b,
2265+
const HighsCallbackDataOut* cb_out,
2266+
HighsCallbackDataIn* cb_in, void* e) {
2267+
HighsCCallbackDataOut cc_out = static_cast<HighsCCallbackDataOut>(*cb_out);
2268+
HighsCCallbackDataIn cc_in;
2269+
cc_in.user_interrupt = 0;
2270+
cc_in.user_solution_size = 0;
2271+
cc_in.user_solution = nullptr;
2272+
2273+
c_callback(a, b.c_str(), &cc_out, &cc_in, e);
2274+
*cb_in = cc_in; // copy the data in
2275+
};
22762276
this->callback_.user_callback_data = user_callback_data;
22772277

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

highs/mip/HighsMipSolverData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,7 @@ void HighsMipSolverData::callbackUserSolution(
26002600
assert(!interrupt);
26012601
if (mipsolver.callback_->data_in.user_solution.size() ==
26022602
mipsolver.orig_model_->num_col_) {
2603-
const std::vector<double>& user_solution = mipsolver.callback_->data_in.user_solution;
2603+
const auto& user_solution = mipsolver.callback_->data_in.user_solution;
26042604
double bound_violation_ = 0;
26052605
double row_violation_ = 0;
26062606
double integrality_violation_ = 0;

0 commit comments

Comments
 (0)