cleanup

google · Dec 26, 2023 · bef205a · bef205a
1 parent c1b29b9
commit bef205a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel
@@ -262,7 +262,6 @@ cc_library(
         "//ortools/base:stl_util",
         "//ortools/base:timer",
         "//ortools/gurobi:environment",
-        "//ortools/xpress:environment",
         "//ortools/gurobi:gurobi_util",
         "//ortools/linear_solver/proto_solver:glop_proto_solver",
         "//ortools/linear_solver/proto_solver:gurobi_proto_solver",
@@ -276,6 +275,7 @@ cc_library(
         "//ortools/sat:lp_utils",
         "//ortools/util:fp_utils",
         "//ortools/util:lazy_mutable_copy",
+        "//ortools/xpress:environment",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",

diff --git a/ortools/linear_solver/proto_solver/BUILD.bazel b/ortools/linear_solver/proto_solver/BUILD.bazel
@@ -174,10 +174,10 @@ cc_library(
     hdrs = ["xpress_proto_solver.h"],
     deps = [
         "//ortools/base:timer",
-        "//ortools/xpress:environment",
         "//ortools/linear_solver:linear_solver_cc_proto",
         "//ortools/linear_solver:model_validator",
         "//ortools/util:lazy_mutable_copy",
+        "//ortools/xpress:environment",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/cleanup",
         "@com_google_absl//absl/log",
@@ -189,4 +189,4 @@ cc_library(
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",
     ],
-)
+)
diff --git a/ortools/linear_solver/wrappers/model_builder_helper.cc b/ortools/linear_solver/wrappers/model_builder_helper.cc
@@ -595,16 +595,14 @@ void ModelSolverHelper::Solve(const ModelBuilderHelper& model) {
       break;
     }
 #endif  // defined(USE_PDLP)
-    case MPModelRequest::
-        GUROBI_LINEAR_PROGRAMMING:  // ABSL_FALLTHROUGH_INTENDED
+    case MPModelRequest::GUROBI_LINEAR_PROGRAMMING:  // ABSL_FALLTHROUGH_INTENDED
     case MPModelRequest::GUROBI_MIXED_INTEGER_PROGRAMMING: {
       const auto temp = GurobiSolveProto(request);
       if (temp.ok()) {
         response_ = std::move(temp.value());
       }
     }
-    case MPModelRequest::
-       XPRESS_LINEAR_PROGRAMMING:  // ABSL_FALLTHROUGH_INTENDED
+    case MPModelRequest::XPRESS_LINEAR_PROGRAMMING:  // ABSL_FALLTHROUGH_INTENDED
     case MPModelRequest::XPRESS_MIXED_INTEGER_PROGRAMMING: {
       response_ = XPressSolveProto(request);
       break;