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

tentative support for LP_PARSER=OFF

Browse Source
This commit is contained in:
Laurent Perron
2023-03-15 16:34:51 +01:00
parent 13fae89e88
commit de2139e970
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ortools/linear_solver/BUILD.bazel
View File

@@ -230,6 +230,7 @@ cc_library(
cc_binary(
name = "solve",
srcs = ["solve.cc"],
defines = ["USE_LP_PARSER"],
deps = [
":linear_solver",
":linear_solver_cc_proto",

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

@@ -442,11 +442,11 @@ absl::Status AddMinMaxConstraint(const MPGeneralConstraintProto& gen_cst,
vars = {scip_resultant_var};
vals = {1};
if (gen_cst.has_min_constraint()) {
RETURN_IF_ERROR(add_lin_constraint(absl::StrCat("_ineq_constant"),
-kInfinity, minmax.constant()));
RETURN_IF_ERROR(
add_lin_constraint("_ineq_constant", -kInfinity, minmax.constant()));
} else {
RETURN_IF_ERROR(add_lin_constraint(absl::StrCat("_ineq_constant"),
minmax.constant(), kInfinity));
RETURN_IF_ERROR(
add_lin_constraint("_ineq_constant", minmax.constant(), kInfinity));
}
}
for (SCIP_CONS* scip_cons : cons) {

4
ortools/linear_solver/solve.cc
View File

@@ -133,11 +133,15 @@ MPModelRequest ReadMipModel(const std::string& input) {
MPModelRequest request_proto;
MPModelProto model_proto;
if (absl::EndsWith(input, ".lp")) {
#if defined(USE_LP_PARSER)
std::string data;
CHECK_OK(file::GetContents(input, &data, file::Defaults()));
absl::StatusOr<MPModelProto> result = ModelProtoFromLpFormat(data);
CHECK_OK(result);
model_proto = std::move(result).value();
#else // !defined(USE_LP_PARSER)
LOG(FATAL) << "Support for parsing LP format is not compiled in.";
#endif // !defined(USE_LP_PARSER)
} else if (absl::EndsWith(input, ".mps") ||
absl::EndsWith(input, ".mps.gz")) {
QCHECK_OK(glop::MPSReader().ParseFile(input, &model_proto))