Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Minor auto iterator cleanup

Browse Source
This commit is contained in:
Patrick Niklaus 2016-03-07 19:06:51 +01:00
parent 5e5f72ae57
commit ba5f0af5a4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/engine/plugins/trip.cpp
View File

@ -200,8 +200,6 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
// get scc components // get scc components
SCC_Component scc = SplitUnaccessibleLocations(number_of_locations, result_table); SCC_Component scc = SplitUnaccessibleLocations(number_of_locations, result_table);
using NodeIDIterator = typename std::vector<NodeID>::const_iterator;
std::vector<std::vector<NodeID>> trips; std::vector<std::vector<NodeID>> trips;
trips.reserve(scc.GetNumberOfComponents()); trips.reserve(scc.GetNumberOfComponents());
// run Trip computation for every SCC // run Trip computation for every SCC
@ -212,25 +210,26 @@ Status TripPlugin::HandleRequest(const api::TripParameters &parameters,
BOOST_ASSERT_MSG(component_size > 0, "invalid component size"); BOOST_ASSERT_MSG(component_size > 0, "invalid component size");
std::vector<NodeID> scc_route; std::vector<NodeID> scc_route;
NodeIDIterator start = std::begin(scc.component) + scc.range[k]; auto route_begin = std::begin(scc.component) + scc.range[k];
NodeIDIterator end = std::begin(scc.component) + scc.range[k + 1]; auto route_end = std::begin(scc.component) + scc.range[k + 1];
if (component_size > 1) if (component_size > 1)
{ {
if (component_size < BF_MAX_FEASABLE) 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 else
{ {
scc_route = scc_route = trip::FarthestInsertionTrip(route_begin, route_end, number_of_locations,
trip::FarthestInsertionTrip(start, end, number_of_locations, result_table); result_table);
} }
} }
else else
{ {
scc_route = std::vector<NodeID>(start, end); scc_route = std::vector<NodeID>(route_begin, route_end);
} }
trips.push_back(std::move(scc_route)); trips.push_back(std::move(scc_route));