added model name and feasible status, testing with cmake and dev bran…

…ch of highs
galabovaa · Sep 24, 2024 · a67b70b · a67b70b
1 parent 38a3e1a
commit a67b70b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -248,7 +248,8 @@ if(BUILD_HIGHS)
   FetchContent_Declare(
     highs
     GIT_REPOSITORY "https://github.com/ERGO-Code/HiGHS.git"
-    GIT_TAG        "v1.7.2"
+    # GIT_TAG        "v1.7.2"
+    GIT_BRANCH "ortools"
     GIT_SHALLOW TRUE
     #PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/highs.patch"
   )

diff --git a/ortools/linear_solver/proto_solver/highs_proto_solver.cc b/ortools/linear_solver/proto_solver/highs_proto_solver.cc
@@ -54,7 +54,7 @@ absl::StatusOr<MPSolutionResponse> HighsSolveProto(
   // TODO(user): Set model name.
   if (model.has_name()) {
     const std::string model_name = model.name();
-    // highs.passModelName(model_name);
+    highs.passModelName(model_name);
   }
 
   if (request->has_solver_specific_parameters()) {
@@ -245,6 +245,9 @@ absl::StatusOr<MPSolutionResponse> HighsSolveProto(
           break;
         default: {
           // TODO(user): report feasible status.
+          const HighsInfo& info = Highs::getInfo().
+          if (info.primal_solution_status == HighsSolutionStatus::kSolutionStatusFeasible)
+          response.set_status(MPSOLVER_FEASIBLE);
           break;
         }
       }