diff --git a/Dependencies.txt b/Dependencies.txt index 043934b218..f5638d345a 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -9,7 +9,7 @@ Clp=1.17.7 Cgl=0.60.5 Cbc=2.10.7 GLPK=5.0 -HiGHS=v1.7.2 +HiGHS=v1.8.0 Scip=v900 # Python pybind11=v2.12.0 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 52b085c3f3..b4d6bae636 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -252,7 +252,7 @@ if(BUILD_HIGHS) GIT_TAG "v1.8.0" GIT_SHALLOW TRUE PATCH_COMMAND git apply --ignore-whitespace - "${CMAKE_CURRENT_LIST_DIR}/../../patches/highs-v1.7.2.patch" + "${CMAKE_CURRENT_LIST_DIR}/../../patches/highs-v1.8.0.patch" ) FetchContent_MakeAvailable(highs) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/ortools/linear_solver/proto_solver/highs_proto_solver.cc b/ortools/linear_solver/proto_solver/highs_proto_solver.cc index bc99b81d29..5122a5652a 100644 --- a/ortools/linear_solver/proto_solver/highs_proto_solver.cc +++ b/ortools/linear_solver/proto_solver/highs_proto_solver.cc @@ -52,7 +52,7 @@ absl::StatusOr HighsSolveProto( const MPModelProto& model = **optional_model; Highs highs; - // TODO(user): Set model name. + // Set model name. if (model.has_name()) { const std::string model_name = model.name(); highs.passModelName(model_name); @@ -115,8 +115,7 @@ absl::StatusOr HighsSolveProto( highs.changeColCost(column, obj_coeffs[column]); } - // TODO(user): Support variable names. - // Variable names + // Variable names. for (int v = 0; v < variable_size; ++v) { const MPVariableProto& variable = model.variable(v); std::string varname_str = ""; @@ -126,7 +125,7 @@ absl::StatusOr HighsSolveProto( } } - // TODO(user): Support hints. + // Hints. int num_hints = model.solution_hint().var_index_size(); if (num_hints > 0) { std::vector hint_index(0, num_hints); @@ -184,8 +183,7 @@ absl::StatusOr HighsSolveProto( } } - // TODO(user): Support constraint names. - // Constraint names + // Constraint names. for (int c = 0; c < model.constraint_size(); ++c) { const MPConstraintProto& constraint = model.constraint(c); std::string constraint_name_str = ""; diff --git a/patches/highs-v1.7.2.patch b/patches/highs-v1.8.0.patch similarity index 100% rename from patches/highs-v1.7.2.patch rename to patches/highs-v1.8.0.patch