math_opt: export from google3
This commit is contained in:
@@ -381,7 +381,6 @@ cc_library(
|
||||
"//ortools/math_opt:parameters_cc_proto",
|
||||
"//ortools/math_opt/solvers:gurobi_cc_proto",
|
||||
"@com_google_absl//absl/status:statusor",
|
||||
"@com_google_absl//absl/strings",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -14,11 +14,8 @@
|
||||
#include "ortools/math_opt/cpp/streamable_solver_init_arguments.h"
|
||||
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
|
||||
#include "absl/status/statusor.h"
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "ortools/math_opt/parameters.pb.h"
|
||||
#include "ortools/math_opt/solvers/gurobi.pb.h"
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#include <string>
|
||||
|
||||
#include "absl/status/statusor.h"
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "ortools/math_opt/parameters.pb.h"
|
||||
#include "ortools/math_opt/solvers/gurobi.pb.h"
|
||||
|
||||
|
||||
@@ -622,7 +622,7 @@ TEST_P(IpParameterTest, NodeLimit) {
|
||||
"https://paste.googleplex.com/5694421105377280";
|
||||
}
|
||||
if (GetParam().solver_type == SolverType::kGscip) {
|
||||
GTEST_SKIP() << "This test does not work for SCIP v900";
|
||||
GTEST_SKIP() << "This test does not work with SCIP v900";
|
||||
}
|
||||
const std::unique_ptr<const Model> model = DenseIndependentSet(true);
|
||||
SolveParameters params = {.node_limit = 1};
|
||||
@@ -1001,7 +1001,7 @@ TEST_P(IpParameterTest, SolutionLimitOneAndCutoff) {
|
||||
// Tests the interaction between cutoff and an additional limit.
|
||||
TEST_P(IpParameterTest, NoSolutionsBelowCutoffEarlyTermination) {
|
||||
if (GetParam().solver_type == SolverType::kGscip) {
|
||||
GTEST_SKIP() << "This test does not work for SCIP v900";
|
||||
GTEST_SKIP() << "This test does not work with SCIP v900";
|
||||
}
|
||||
if (!(GetParam().parameter_support.supports_cutoff)) {
|
||||
// We have already tested that the right error message is returned.
|
||||
|
||||
Reference in New Issue
Block a user