fix

Author: lperron

ortools/linear_solver/proto_solver/xpress_proto_solver.cc

@@ -271,10 +271,9 @@ namespace operations_research {
 
 //   if (error_messages.empty()) return "";
 //   return absl::StrJoin(error_messages, "\n");
-}
+// }
 
-MPSolutionResponse XPressSolveProto(const MPModelRequest& request,
-                                    XPRSprob xpress_env) {
+MPSolutionResponse XPressSolveProto(const MPModelRequest& request) {
   MPSolutionResponse response;
   response.set_status(MPSolverResponseStatus::MPSOLVER_SOLVER_TYPE_UNAVAILABLE);
 
@@ -355,9 +354,7 @@ MPSolutionResponse XPressSolveProto(const MPModelRequest& request,
 //       lb[v] = variable.lower_bound();
 //       ub[v] = variable.upper_bound();
 //       ctype[v] = variable.is_integer() &&
-//                          request.solver_type() ==
-//                              MPModelRequest::XPRESS_MIXED_INTEGER_PROGRAMMING
-//                      ? XPRS_INTEGER
+//                          request.solver_type() ==SolutionRes
 //                      : XPRS_CONTINUOUS;
 //       if (variable.is_integer()) has_integer_variables = true;
 //       if (!variable.name().empty()) varnames[v] = variable.name().c_str();

ortools/linear_solver/proto_solver/xpress_proto_solver.h

@@ -16,16 +16,13 @@
 
 #include <string>
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-#include "ortools/xpress/environment.h"
 #include "ortools/linear_solver/linear_solver.pb.h"
 
 namespace operations_research {
 
 // Solves the input request.
-MPSolutionResponse XpressSolveProto(const MPModelRequest& request);
+MPSolutionResponse XPressSolveProto(const MPModelRequest& request);
 
 }  // namespace operations_research
+
 #endif  // OR_TOOLS_LINEAR_SOLVER_PROTO_SOLVER_XPRESS_PROTO_SOLVER_H_

ortools/linear_solver/wrappers/model_builder_helper.cc

@@ -606,10 +606,8 @@ void ModelSolverHelper::Solve(const ModelBuilderHelper& model) {
     case MPModelRequest::
        XPRESS_LINEAR_PROGRAMMING:  // ABSL_FALLTHROUGH_INTENDED
     case MPModelRequest::XPRESS_MIXED_INTEGER_PROGRAMMING: {
-      const auto temp = XpressSolveProto(request);
-      if (temp.ok()) {
-        response_ = std::move(temp.value());
-      }
+      response_ = XPressSolveProto(request);
+      break;
     }
 
     default: {