From 5cc1d38e9fee5d4fe86ae05b4dc6125a99b98bb5 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Tue, 16 Jul 2024 15:26:56 +0200 Subject: [PATCH] spans --- ortools/graph/BUILD.bazel | 1 + ortools/graph/bidirectional_dijkstra_test.cc | 3 ++- ortools/graph/christofides_test.cc | 3 ++- ortools/graph/cliques_test.cc | 3 ++- ortools/graph/max_flow_test.cc | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ortools/graph/BUILD.bazel b/ortools/graph/BUILD.bazel index d0973f4a4b..fe0f5883b5 100644 --- a/ortools/graph/BUILD.bazel +++ b/ortools/graph/BUILD.bazel @@ -273,6 +273,7 @@ cc_test( "//ortools/util:file_util", "@com_google_absl//absl/random", "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", "@com_google_benchmark//:benchmark", "@com_google_protobuf//:protobuf", ], diff --git a/ortools/graph/bidirectional_dijkstra_test.cc b/ortools/graph/bidirectional_dijkstra_test.cc index 87598aea41..ecab06a1f3 100644 --- a/ortools/graph/bidirectional_dijkstra_test.cc +++ b/ortools/graph/bidirectional_dijkstra_test.cc @@ -24,6 +24,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/random/distributions.h" #include "absl/strings/str_cat.h" +#include "absl/types/span.h" #include "gtest/gtest.h" #include "ortools/base/gmock.h" #include "ortools/graph/bounded_dijkstra.h" @@ -154,7 +155,7 @@ TEST(BidirectionalDijkstraTest, RandomizedCorrectnessTest) { return out; }; auto print_node_distances = - [&](const std::vector& nds) -> std::string { + [&](absl::Span nds) -> std::string { std::string out = "{"; for (const Dijkstra::NodeDistance& nd : nds) { absl::StrAppend(&out, " #", nd.node, " dist=", (nd.distance), ","); diff --git a/ortools/graph/christofides_test.cc b/ortools/graph/christofides_test.cc index 797cdd2d86..b08699ba3f 100644 --- a/ortools/graph/christofides_test.cc +++ b/ortools/graph/christofides_test.cc @@ -22,6 +22,7 @@ #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" +#include "absl/types/span.h" #include "benchmark/benchmark.h" #include "gtest/gtest.h" #include "ortools/base/logging.h" @@ -30,7 +31,7 @@ namespace operations_research { // Displays the path. -std::string PathToString(const std::vector& path) { +std::string PathToString(absl::Span path) { std::string path_string; const int size = path.size(); for (int i = 0; i < size; i++) { diff --git a/ortools/graph/cliques_test.cc b/ortools/graph/cliques_test.cc index 7ec860b969..37b4db82a9 100644 --- a/ortools/graph/cliques_test.cc +++ b/ortools/graph/cliques_test.cc @@ -26,6 +26,7 @@ #include "absl/functional/bind_front.h" #include "absl/random/distributions.h" #include "absl/strings/str_cat.h" +#include "absl/types/span.h" #include "benchmark/benchmark.h" #include "gtest/gtest.h" #include "ortools/base/mathutil.h" @@ -76,7 +77,7 @@ class CliqueSizeVerifier { int64_t num_cliques() const { return num_cliques_; } - bool AppendClique(const std::vector& new_clique) { + bool AppendClique(absl::Span new_clique) { EXPECT_GE(expected_max_clique_size_, new_clique.size()); EXPECT_LE(expected_min_clique_size_, new_clique.size()); ++num_cliques_; diff --git a/ortools/graph/max_flow_test.cc b/ortools/graph/max_flow_test.cc index 7cdc161173..0538f28b20 100644 --- a/ortools/graph/max_flow_test.cc +++ b/ortools/graph/max_flow_test.cc @@ -23,6 +23,7 @@ #include "absl/random/random.h" #include "absl/strings/str_format.h" +#include "absl/types/span.h" #include "benchmark/benchmark.h" #include "google/protobuf/text_format.h" #include "gtest/gtest.h" @@ -485,7 +486,7 @@ void GenerateRandomArcValuations(const Graph& graph, const int64_t max_range, } template -void SetUpNetworkData(const std::vector& arc_capacity, +void SetUpNetworkData(absl::Span arc_capacity, GenericMaxFlow* max_flow) { const Graph* graph = max_flow->graph(); for (typename Graph::ArcIndex arc = 0; arc < graph->num_arcs(); ++arc) {