fix #5016

Author: lperron

ortools/linear_solver/proto_solver/BUILD.bazel

@@ -222,6 +222,7 @@ cc_library(
         "//ortools/linear_solver:linear_solver_cc_proto",
         "//ortools/linear_solver:model_validator",
         "//ortools/util:lazy_mutable_copy",
+        "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/status:statusor",
         "@abseil-cpp//absl/strings",

ortools/linear_solver/proto_solver/highs_proto_solver.cc

@@ -21,6 +21,7 @@
 #include <vector>
 
 #include "Highs.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -222,43 +223,51 @@ absl::StatusOr<MPSolutionResponse> HighsSolveProto(
   const absl::Time time_before = absl::Now();
   UserTimer user_timer;
   user_timer.Start();
-  HighsStatus run_status = highs.run();
-  switch (run_status) {
-    case HighsStatus::kError: {
-      response.set_status(MPSOLVER_NOT_SOLVED);
-      response.set_status_str("Error running HiGHS run()");
-      return response;
-    }
-    case HighsStatus::kWarning: {
-      response.set_status_str("Warning HiGHS run()");
+  const HighsStatus run_status = highs.run();
+  VLOG(2) << "run_status: " << highsStatusToString(run_status);
+  if (run_status == HighsStatus::kError) {
+    response.set_status(MPSOLVER_NOT_SOLVED);
+    response.set_status_str("Error running HiGHS run()");
+    return response;
+  }
+  const HighsModelStatus model_status = highs.getModelStatus();
+  VLOG(2) << "model_status: " << highs.modelStatusToString(model_status);
+
+  switch (model_status) {
+    case HighsModelStatus::kOptimal:
+      response.set_status(MPSOLVER_OPTIMAL);
+      break;
+    case HighsModelStatus::kUnboundedOrInfeasible:
+      response.set_status_str(
+          "The model may actually be unbounded: HiGHS returned "
+          "kUnboundedOrInfeasible");
+      response.set_status(MPSOLVER_INFEASIBLE);
+      break;
+    case HighsModelStatus::kInfeasible:
+      response.set_status(MPSOLVER_INFEASIBLE);
+      break;
+    case HighsModelStatus::kUnbounded:
+      response.set_status(MPSOLVER_UNBOUNDED);
+      break;
+    case HighsModelStatus::kTimeLimit:       // ABSL_FALLTHROUGH_INTENDED
+    case HighsModelStatus::kIterationLimit:  // ABSL_FALLTHROUGH_INTENDED
+    case HighsModelStatus::kInterrupt:       // ABSL_FALLTHROUGH_INTENDED
+    case HighsModelStatus::kSolutionLimit:   // ABSL_FALLTHROUGH_INTENDED
+    case HighsModelStatus::kMemoryLimit: {
+      const HighsInfo& info = highs.getInfo();
+      if (info.primal_solution_status == kSolutionStatusFeasible) {
+        response.set_status(MPSOLVER_FEASIBLE);
+      } else {
+        response.set_status(MPSOLVER_UNKNOWN_STATUS);
+      }
       break;
     }
-    case HighsStatus::kOk: {
-      HighsModelStatus model_status = highs.getModelStatus();
-      switch (model_status) {
-        case HighsModelStatus::kOptimal:
-          response.set_status(MPSOLVER_OPTIMAL);
-          break;
-        case HighsModelStatus::kUnboundedOrInfeasible:
-          response.set_status_str(
-              "The model may actually be unbounded: HiGHS returned "
-              "kUnboundedOrInfeasible");
-          response.set_status(MPSOLVER_INFEASIBLE);
-          break;
-        case HighsModelStatus::kInfeasible:
-          response.set_status(MPSOLVER_INFEASIBLE);
-          break;
-        case HighsModelStatus::kUnbounded:
-          response.set_status(MPSOLVER_UNBOUNDED);
-          break;
-        default: {
-          // TODO(user): report feasible status.
-          const HighsInfo& info = highs.getInfo();
-          if (info.primal_solution_status == kSolutionStatusFeasible)
-            response.set_status(MPSOLVER_FEASIBLE);
-          break;
-        }
+    default: {
+      const HighsInfo& info = highs.getInfo();
+      if (info.primal_solution_status == kSolutionStatusFeasible) {
+        response.set_status(MPSOLVER_FEASIBLE);
       }
+      break;
     }
   }
 

ortools/linear_solver/python/solve_model.py

@@ -24,6 +24,9 @@
 _INPUT = flags.DEFINE_string("input", "", "Input file to load and solve.")
 _PARAMS = flags.DEFINE_string("params", "", "Solver parameters in string format.")
 _SOLVER = flags.DEFINE_string("solver", "sat", "Solver type to solve the model with.")
+_TIME_LIMIT = flags.DEFINE_float(
+    "time_limit", -1, "Time limit in seconds for the solver. -1 means no limit."
+)
 
 
 def main(argv: Sequence[str]) -> None:
@@ -52,6 +55,10 @@ def main(argv: Sequence[str]) -> None:
         print(f"Cannot create solver with name '{_SOLVER.value}'")
         return
 
+    # Set time limit.
+    if _TIME_LIMIT.value > 0:
+        solver.set_time_limit_in_seconds(_TIME_LIMIT.value)
+
     # Set parameters.
     if _PARAMS.value:
         solver.set_solver_specific_parameters(_PARAMS.value)
@@ -60,7 +67,8 @@ def main(argv: Sequence[str]) -> None:
     solver.enable_output(True)
 
     # And solve.
-    solver.solve(model)
+    status = solver.solve(model)
+    print(f"Status: {status}")
 
 
 if __name__ == "__main__":