From ba5f0af5a45b4b0e075ddc2467f83cacea39ac8b Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 7 Mar 2016 19:06:51 +0100 Subject: [PATCH] Minor auto iterator cleanup --- src/engine/plugins/trip.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp index 209fb7b38..6df5ea6ca 100644 --- a/src/engine/plugins/trip.cpp +++ b/src/engine/plugins/trip.cpp @@ -200,8 +200,6 @@ Status TripPlugin::HandleRequest(const api::TripParameters ¶meters, // get scc components SCC_Component scc = SplitUnaccessibleLocations(number_of_locations, result_table); - using NodeIDIterator = typename std::vector::const_iterator; - std::vector> trips; trips.reserve(scc.GetNumberOfComponents()); // run Trip computation for every SCC @@ -212,25 +210,26 @@ Status TripPlugin::HandleRequest(const api::TripParameters ¶meters, BOOST_ASSERT_MSG(component_size > 0, "invalid component size"); std::vector scc_route; - NodeIDIterator start = std::begin(scc.component) + scc.range[k]; - NodeIDIterator end = std::begin(scc.component) + scc.range[k + 1]; + auto route_begin = std::begin(scc.component) + scc.range[k]; + auto route_end = std::begin(scc.component) + scc.range[k + 1]; if (component_size > 1) { if (component_size < BF_MAX_FEASABLE) { - scc_route = trip::BruteForceTrip(start, end, number_of_locations, result_table); + scc_route = + trip::BruteForceTrip(route_begin, route_end, number_of_locations, result_table); } else { - scc_route = - trip::FarthestInsertionTrip(start, end, number_of_locations, result_table); + scc_route = trip::FarthestInsertionTrip(route_begin, route_end, number_of_locations, + result_table); } } else { - scc_route = std::vector(start, end); + scc_route = std::vector(route_begin, route_end); } trips.push_back(std::move(scc_route));