From 8dc806710a199fd17e312dabfd9f7b936f336403 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 25 May 2022 17:23:18 +0200 Subject: [PATCH] cpp: sync from google3 --- ortools/glop/lp_solver.cc | 5 +++-- ortools/graph/max_flow.cc | 5 +++-- ortools/graph/perfect_matching.cc | 3 ++- ortools/gscip/gscip_ext.cc | 2 ++ ortools/gscip/gscip_ext.h | 2 ++ ortools/gscip/gscip_parameters.cc | 3 +++ ortools/gscip/legacy_scip_params.cc | 1 + ortools/util/file_util.cc | 1 - ortools/util/lazy_mutable_copy.h | 2 +- ortools/util/logging.cc | 2 ++ ortools/util/piecewise_linear_function.cc | 2 ++ ortools/util/sorted_interval_list.h | 1 + ortools/util/stats.cc | 2 ++ ortools/util/time_limit.cc | 4 ++++ ortools/util/time_limit.h | 22 +++++++++++----------- 15 files changed, 39 insertions(+), 18 deletions(-) diff --git a/ortools/glop/lp_solver.cc b/ortools/glop/lp_solver.cc index a93137802d..ad4412c21c 100644 --- a/ortools/glop/lp_solver.cc +++ b/ortools/glop/lp_solver.cc @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -282,7 +283,7 @@ void LPSolver::SetInitialBasis( } } if (revised_simplex_ == nullptr) { - revised_simplex_ = absl::make_unique(); + revised_simplex_ = std::make_unique(); revised_simplex_->SetLogger(&logger_); } revised_simplex_->LoadStateForNextSolve(state); @@ -589,7 +590,7 @@ void LPSolver::RunRevisedSimplexIfNeeded(ProblemSolution* solution, current_linear_program_.ClearTransposeMatrix(); if (solution->status != ProblemStatus::INIT) return; if (revised_simplex_ == nullptr) { - revised_simplex_ = absl::make_unique(); + revised_simplex_ = std::make_unique(); revised_simplex_->SetLogger(&logger_); } revised_simplex_->SetParameters(parameters_); diff --git a/ortools/graph/max_flow.cc b/ortools/graph/max_flow.cc index ff4a8a018e..f875d2abf0 100644 --- a/ortools/graph/max_flow.cc +++ b/ortools/graph/max_flow.cc @@ -14,6 +14,7 @@ #include "ortools/graph/max_flow.h" #include +#include #include #include "absl/memory/memory.h" @@ -64,14 +65,14 @@ SimpleMaxFlow::Status SimpleMaxFlow::Solve(NodeIndex source, NodeIndex sink) { if (source >= num_nodes_ || sink >= num_nodes_) { return OPTIMAL; } - underlying_graph_ = absl::make_unique(num_nodes_, num_arcs); + underlying_graph_ = std::make_unique(num_nodes_, num_arcs); underlying_graph_->AddNode(source); underlying_graph_->AddNode(sink); for (int arc = 0; arc < num_arcs; ++arc) { underlying_graph_->AddArc(arc_tail_[arc], arc_head_[arc]); } underlying_graph_->Build(&arc_permutation_); - underlying_max_flow_ = absl::make_unique>( + underlying_max_flow_ = std::make_unique>( underlying_graph_.get(), source, sink); for (ArcIndex arc = 0; arc < num_arcs; ++arc) { ArcIndex permuted_arc = diff --git a/ortools/graph/perfect_matching.cc b/ortools/graph/perfect_matching.cc index 0f96a49331..39c133ea0d 100644 --- a/ortools/graph/perfect_matching.cc +++ b/ortools/graph/perfect_matching.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -25,7 +26,7 @@ namespace operations_research { void MinCostPerfectMatching::Reset(int num_nodes) { - graph_ = absl::make_unique(num_nodes); + graph_ = std::make_unique(num_nodes); optimal_cost_ = 0; matches_.assign(num_nodes, -1); } diff --git a/ortools/gscip/gscip_ext.cc b/ortools/gscip/gscip_ext.cc index 3807e40e1f..482a9cc085 100644 --- a/ortools/gscip/gscip_ext.cc +++ b/ortools/gscip/gscip_ext.cc @@ -13,6 +13,8 @@ #include "ortools/gscip/gscip_ext.h" +#include + #include "ortools/base/logging.h" #include "ortools/base/status_macros.h" diff --git a/ortools/gscip/gscip_ext.h b/ortools/gscip/gscip_ext.h index 59da5dd885..69bcc302fc 100644 --- a/ortools/gscip/gscip_ext.h +++ b/ortools/gscip/gscip_ext.h @@ -26,6 +26,8 @@ #ifndef OR_TOOLS_GSCIP_GSCIP_EXT_H_ #define OR_TOOLS_GSCIP_GSCIP_EXT_H_ +#include + #include "absl/status/status.h" #include "ortools/gscip/gscip.h" #include "scip/scip.h" diff --git a/ortools/gscip/gscip_parameters.cc b/ortools/gscip/gscip_parameters.cc index 6bf5818145..3787bf88a3 100644 --- a/ortools/gscip/gscip_parameters.cc +++ b/ortools/gscip/gscip_parameters.cc @@ -13,6 +13,9 @@ #include "ortools/gscip/gscip_parameters.h" +#include +#include + #include "ortools/base/logging.h" namespace operations_research { diff --git a/ortools/gscip/legacy_scip_params.cc b/ortools/gscip/legacy_scip_params.cc index e31d3bc84f..6560b7ef8b 100644 --- a/ortools/gscip/legacy_scip_params.cc +++ b/ortools/gscip/legacy_scip_params.cc @@ -14,6 +14,7 @@ #include "ortools/gscip/legacy_scip_params.h" #include +#include #include "absl/status/status.h" #include "absl/strings/numbers.h" diff --git a/ortools/util/file_util.cc b/ortools/util/file_util.cc index 61ef15bd4a..f96bb62c61 100644 --- a/ortools/util/file_util.cc +++ b/ortools/util/file_util.cc @@ -29,7 +29,6 @@ namespace operations_research { -using ::google::protobuf::TextFormat; using google::protobuf::util::JsonParseOptions; using google::protobuf::util::JsonStringToMessage; diff --git a/ortools/util/lazy_mutable_copy.h b/ortools/util/lazy_mutable_copy.h index 114152e832..1139853893 100644 --- a/ortools/util/lazy_mutable_copy.h +++ b/ortools/util/lazy_mutable_copy.h @@ -55,7 +55,7 @@ class LazyMutableCopy { const T& get() const { return copy_ != nullptr ? *copy_ : *original_; } T* get_mutable() { if (copy_ == nullptr) { - copy_ = absl::make_unique(*original_); + copy_ = std::make_unique(*original_); original_ = nullptr; } return copy_.get(); diff --git a/ortools/util/logging.cc b/ortools/util/logging.cc index 621e2409e3..c7cdc4940b 100644 --- a/ortools/util/logging.cc +++ b/ortools/util/logging.cc @@ -13,7 +13,9 @@ #include "ortools/util/logging.h" +#include #include +#include #include "absl/strings/str_cat.h" #include "ortools/base/logging.h" diff --git a/ortools/util/piecewise_linear_function.cc b/ortools/util/piecewise_linear_function.cc index 19a354b970..7a861a43f9 100644 --- a/ortools/util/piecewise_linear_function.cc +++ b/ortools/util/piecewise_linear_function.cc @@ -14,8 +14,10 @@ #include "ortools/util/piecewise_linear_function.h" #include +#include #include #include +#include #include #include "absl/container/btree_set.h" diff --git a/ortools/util/sorted_interval_list.h b/ortools/util/sorted_interval_list.h index d3b37ddf6e..0406119e13 100644 --- a/ortools/util/sorted_interval_list.h +++ b/ortools/util/sorted_interval_list.h @@ -15,6 +15,7 @@ #define OR_TOOLS_UTIL_SORTED_INTERVAL_LIST_H_ #include +#include #include #include #include diff --git a/ortools/util/stats.cc b/ortools/util/stats.cc index 3d24086a9c..6d43c5cf52 100644 --- a/ortools/util/stats.cc +++ b/ortools/util/stats.cc @@ -13,7 +13,9 @@ #include "ortools/util/stats.h" +#include #include +#include #include "absl/strings/str_format.h" #include "ortools/base/stl_util.h" diff --git a/ortools/util/time_limit.cc b/ortools/util/time_limit.cc index 4a89c7ad9b..ace74ad340 100644 --- a/ortools/util/time_limit.cc +++ b/ortools/util/time_limit.cc @@ -13,6 +13,10 @@ #include "ortools/util/time_limit.h" +#include +#include +#include + #include "absl/strings/str_cat.h" ABSL_FLAG(bool, time_limit_use_usertime, false, diff --git a/ortools/util/time_limit.h b/ortools/util/time_limit.h index f6b9f6ea94..6e53096621 100644 --- a/ortools/util/time_limit.h +++ b/ortools/util/time_limit.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "absl/base/port.h" #include "absl/container/flat_hash_map.h" @@ -133,10 +134,9 @@ class TimeLimit { * deterministic time and instruction count limit. */ static std::unique_ptr Infinite() { - return absl::make_unique( - std::numeric_limits::infinity(), - std::numeric_limits::infinity(), - std::numeric_limits::infinity()); + return std::make_unique(std::numeric_limits::infinity(), + std::numeric_limits::infinity(), + std::numeric_limits::infinity()); } /** @@ -144,9 +144,9 @@ class TimeLimit { */ static std::unique_ptr FromDeterministicTime( double deterministic_limit) { - return absl::make_unique( - std::numeric_limits::infinity(), deterministic_limit, - std::numeric_limits::infinity()); + return std::make_unique(std::numeric_limits::infinity(), + deterministic_limit, + std::numeric_limits::infinity()); } /** @@ -159,9 +159,9 @@ class TimeLimit { template static std::unique_ptr FromParameters( const Parameters& parameters) { - return absl::make_unique( - parameters.max_time_in_seconds(), parameters.max_deterministic_time(), - std::numeric_limits::infinity()); + return std::make_unique(parameters.max_time_in_seconds(), + parameters.max_deterministic_time(), + std::numeric_limits::infinity()); } /** @@ -467,7 +467,7 @@ class NestedTimeLimit { template static std::unique_ptr FromBaseTimeLimitAndParameters( TimeLimit* time_limit, const Parameters& parameters) { - return absl::make_unique( + return std::make_unique( time_limit, parameters.max_time_in_seconds(), parameters.max_deterministic_time()); }