From 89b863d651da3b9dfd25490d9e0618cc95d0c2d1 Mon Sep 17 00:00:00 2001 From: "lperron@google.com" Date: Thu, 23 Jun 2011 08:48:05 +0000 Subject: [PATCH] pair -> std::pair on code --- constraint_solver/constraint_solver.cc | 2 +- constraint_solver/constraint_solver.h | 6 +++--- constraint_solver/routing.cc | 8 ++++---- constraint_solver/routing.h | 6 +++--- constraint_solver/search.cc | 10 +++++----- examples/network_routing.cc | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/constraint_solver/constraint_solver.cc b/constraint_solver/constraint_solver.cc index a46068b158..fdebfd1358 100644 --- a/constraint_solver/constraint_solver.cc +++ b/constraint_solver/constraint_solver.cc @@ -2169,7 +2169,7 @@ string Solver::GetName(const PropagationBaseObject* object) const { if (name != NULL) { return *name; } - const pair* delegate_object = + const std::pair* delegate_object = FindOrNull(delegate_objects_, object); if (delegate_object != NULL) { const string& prefix = delegate_object->first; diff --git a/constraint_solver/constraint_solver.h b/constraint_solver/constraint_solver.h index cf2a0dede6..a882e0a8b6 100644 --- a/constraint_solver/constraint_solver.h +++ b/constraint_solver/constraint_solver.h @@ -2278,7 +2278,7 @@ class Solver { const SolverParameters parameters_; hash_map propagation_object_names_; hash_map > delegate_objects_; + std::pair > delegate_objects_; const string empty_name_; scoped_ptr queue_; scoped_ptr trail_; @@ -3765,8 +3765,8 @@ class Pack : public Constraint { scoped_array holes_; uint64 stamp_; Demon* demon_; - std::vector > to_set_; - std::vector > to_unset_; + std::vector > to_set_; + std::vector > to_unset_; bool in_process_; }; diff --git a/constraint_solver/routing.cc b/constraint_solver/routing.cc index 6524f947e1..eb80183773 100644 --- a/constraint_solver/routing.cc +++ b/constraint_solver/routing.cc @@ -361,7 +361,7 @@ RoutingModel::RoutingModel(int nodes, int vehicles) RoutingModel::RoutingModel(int nodes, int vehicles, - const std::vector >& start_end) + const std::vector >& start_end) : solver_(NULL), no_cycle_constraint_(NULL), costs_(vehicles), @@ -434,7 +434,7 @@ RoutingModel::RoutingModel(int nodes, CHECK_EQ(vehicles, starts.size()); CHECK_EQ(vehicles, ends.size()); hash_set depot_set; - std::vector > start_end(starts.size()); + std::vector > start_end(starts.size()); for (int i = 0; i < starts.size(); ++i) { depot_set.insert(starts[i]); depot_set.insert(ends[i]); @@ -641,11 +641,11 @@ void RoutingModel::AddLocalSearchOperator(LocalSearchOperator* ls_operator) { } void RoutingModel::SetDepot(int depot) { - std::vector > start_end(vehicles_, std::make_pair(depot, depot)); + std::vector > start_end(vehicles_, std::make_pair(depot, depot)); SetStartEnd(start_end); } -void RoutingModel::SetStartEnd(const std::vector >& start_end) { + void RoutingModel::SetStartEnd(const std::vector >& start_end) { if (is_depot_set_) { LOG(WARNING) << "A depot has already been specified, ignoring new ones"; return; diff --git a/constraint_solver/routing.h b/constraint_solver/routing.h index a531ecbbbe..6e70cabcd2 100644 --- a/constraint_solver/routing.h +++ b/constraint_solver/routing.h @@ -68,11 +68,11 @@ class RoutingModel { // vehicle route. Used to model multiple depots. RoutingModel(int nodes, int vehicles, - const std::vector >& start_end); + const std::vector >& start_end); // Constructor taking vectors of start nodes and end nodes for each // vehicle route. Used to model multiple depots. // TODO(user): added to simplify SWIG wrapping. Remove when swigging - // std::vector > is ok. + // std::vector > is ok. RoutingModel(int nodes, int vehicles, const std::vector& starts, @@ -232,7 +232,7 @@ class RoutingModel { }; void Initialize(); - void SetStartEnd(const std::vector >& start_end); + void SetStartEnd(const std::vector >& start_end); void AddDisjunctionInternal(const std::vector& nodes, int64 penalty); void AddNoCycleConstraintInternal(); void SetVehicleCostInternal(int vehicle, Solver::IndexEvaluator2* evaluator); diff --git a/constraint_solver/search.cc b/constraint_solver/search.cc index bd178cf5c6..1a203984dd 100644 --- a/constraint_solver/search.cc +++ b/constraint_solver/search.cc @@ -2724,7 +2724,7 @@ SearchMonitor* Solver::MakeSimulatedAnnealing(bool maximize, // ---------- Guided Local Search ---------- -typedef pair Arc; +typedef std::pair Arc; // Base GLS penalties abstract class. Maintains the penalty frequency for each // (variable, value) arc. @@ -2836,8 +2836,8 @@ class GuidedLocalSearch : public Metaheuristic { } protected: struct Comparator { - bool operator() (const pair& i, - const pair& j) { + bool operator() (const std::pair& i, + const std::pair& j) { return i.second > j.second; } }; @@ -3044,14 +3044,14 @@ int64 GuidedLocalSearch::Evaluate(const Assignment* delta, // Penalize all the most expensive arcs (var, value) according to their utility: // utility(i, j) = cost(i, j) / (1 + penalty(i, j)) bool GuidedLocalSearch::LocalOptimum() { - std::vector > utility(size_); + std::vector > utility(size_); for (int i = 0; i < size_; ++i) { const int64 var_value = assignment_.Value(vars_[i]); const int64 value = (var_value != i) ? AssignmentPenalty(assignment_, i, var_value) : 0; const Arc arc(i, var_value); const int64 penalty = penalties_->Value(arc); - utility[i] = pair(arc, value / (penalty + 1.0)); + utility[i] = std::pair(arc, value / (penalty + 1.0)); } Comparator comparator; std::sort(utility.begin(), utility.end(), comparator); diff --git a/examples/network_routing.cc b/examples/network_routing.cc index 22728b0cf3..8deb6c73d4 100644 --- a/examples/network_routing.cc +++ b/examples/network_routing.cc @@ -149,11 +149,11 @@ class NetworkRoutingData { int max_capacity_; int fixed_charge_cost_; #if defined(_MSC_VER) - hash_map, int, PairIntHasher> all_arcs_; - hash_map, int, PairIntHasher> all_demands_; + hash_map, int, PairIntHasher> all_arcs_; + hash_map, int, PairIntHasher> all_demands_; #else - hash_map, int> all_arcs_; - hash_map, int> all_demands_; + hash_map, int> all_arcs_; + hash_map, int> all_demands_; #endif };