Skip to content

Commit fa97da1

Browse files
committed
pdlp sync
1 parent ae43368 commit fa97da1

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

ortools/pdlp/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ cc_library(
257257
":solvers_cc_proto",
258258
"//ortools/base:status_macros",
259259
"@com_google_absl//absl/status",
260+
"@com_google_absl//absl/strings",
260261
],
261262
)
262263

@@ -269,6 +270,7 @@ cc_test(
269270
":solvers_proto_validation",
270271
"//ortools/base:protobuf_util",
271272
"@com_google_absl//absl/status",
273+
"@com_google_absl//absl/strings",
272274
],
273275
)
274276

ortools/pdlp/solvers_proto_validation_test.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "absl/status/status.h"
2020
#include "absl/strings/str_cat.h"
21-
//#include "absl/strings/string_view.h"
21+
#include "absl/strings/string_view.h"
2222
#include "gmock/gmock.h"
2323
#include "gtest/gtest.h"
2424
#include "ortools/base/protobuf_util.h"
@@ -46,10 +46,11 @@ TEST(ValidateTerminationCriteria, BadOptimalityNorm) {
4646
}
4747

4848
void TestTerminationCriteriaValidation(
49-
std::string_view termination_criteria_string,
50-
std::string_view error_substring) {
49+
absl::string_view termination_criteria_string,
50+
absl::string_view error_substring) {
5151
TerminationCriteria termination_criteria =
52-
ParseTextOrDie<TerminationCriteria>(std::string(termination_criteria_string));
52+
ParseTextOrDie<TerminationCriteria>(
53+
std::string(termination_criteria_string));
5354
const absl::Status status = ValidateTerminationCriteria(termination_criteria);
5455
EXPECT_EQ(status.code(), absl::StatusCode::kInvalidArgument)
5556
<< "With termination criteria \"" << termination_criteria_string << "\"";
@@ -60,7 +61,7 @@ void TestTerminationCriteriaValidation(
6061
// Tests that the given DetailedOptimalityCriteria field can't be negative or
6162
// NAN.
6263
void TestDetailedOptimalityCriteriaFieldValidation(
63-
std::string_view field_name) {
64+
absl::string_view field_name) {
6465
const std::string full_field_name =
6566
absl::StrCat("detailed_optimality_criteria.", field_name);
6667
TestTerminationCriteriaValidation(

0 commit comments

Comments
 (0)