always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport from main

Browse Source
This commit is contained in:
Corentin Le Molgat
2024-09-30 17:28:08 +02:00
committed by Mizux Seiha
parent 1dda1bd639
commit ef8716241a
213 changed files with 22043 additions and 2156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ortools/linear_solver/proto_solver/gurobi_proto_solver.cc
View File

@@ -19,6 +19,7 @@
#include <limits>
#include <memory>
#include <numeric>
#include <optional>
#include <string>
#include <vector>
@@ -274,7 +275,7 @@ absl::Status SetSolverSpecificParameters(absl::string_view parameters,
absl::StatusOr<MPSolutionResponse> GurobiSolveProto(
LazyMutableCopy<MPModelRequest> request, GRBenv* gurobi_env) {
MPSolutionResponse response;
const absl::optional<LazyMutableCopy<MPModelProto>> optional_model =
const std::optional<LazyMutableCopy<MPModelProto>> optional_model =
GetMPModelOrPopulateResponse(request, &response);
if (!optional_model) return response;
const MPModelProto& model = **optional_model;

3
ortools/linear_solver/proto_solver/highs_proto_solver.cc
View File

@@ -16,6 +16,7 @@
#include <cassert>
#include <cmath>
#include <limits>
#include <optional>
#include <string>
#include <vector>
@@ -45,7 +46,7 @@ absl::Status SetSolverSpecificParameters(const std::string& parameters,
absl::StatusOr<MPSolutionResponse> HighsSolveProto(
LazyMutableCopy<MPModelRequest> request) {
MPSolutionResponse response;
const absl::optional<LazyMutableCopy<MPModelProto>> optional_model =
const std::optional<LazyMutableCopy<MPModelProto>> optional_model =
GetMPModelOrPopulateResponse(request, &response);
if (!optional_model) return response;
const MPModelProto& model = **optional_model;

3
ortools/linear_solver/proto_solver/scip_proto_solver.cc
View File

@@ -21,6 +21,7 @@
#include <limits>
#include <memory>
#include <numeric>
#include <optional>
#include <set>
#include <string>
#include <vector>
@@ -692,7 +693,7 @@ std::string FindErrorInMPModelForScip(const MPModelProto& model, SCIP* scip) {
absl::StatusOr<MPSolutionResponse> ScipSolveProto(
LazyMutableCopy<MPModelRequest> request) {
MPSolutionResponse response;
const absl::optional<LazyMutableCopy<MPModelProto>> optional_model =
const std::optional<LazyMutableCopy<MPModelProto>> optional_model =
GetMPModelOrPopulateResponse(request, &response);
if (!optional_model) return response;
const MPModelProto& model = **optional_model;