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

change variable name

Browse Source
This commit is contained in:
ijleesw 2021-01-13 16:20:32 +09:00
parent 80f6d7ae15
commit 13ee3ac91a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,65 +215,65 @@ Status TripPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
BOOST_ASSERT(snapped_phantoms.size() == number_of_locations); BOOST_ASSERT(snapped_phantoms.size() == number_of_locations);
// compute the duration table of all phantom nodes // compute the weight table of all phantom nodes
auto result_duration_table = util::DistTableWrapper<EdgeWeight>( auto result_weight_table = util::DistTableWrapper<EdgeWeight>(
std::get<0>( std::get<0>(
algorithms.ManyToManySearch(snapped_phantoms, {}, {}, /*requestDistance*/ false)), algorithms.ManyToManySearch(snapped_phantoms, {}, {}, /*requestDistance*/ false)),
number_of_locations); number_of_locations);
if (result_duration_table.size() == 0) if (result_weight_table.size() == 0)
{ {
return Status::Error; return Status::Error;
} }
const constexpr std::size_t BF_MAX_FEASABLE = 10; const constexpr std::size_t BF_MAX_FEASABLE = 10;
BOOST_ASSERT_MSG(result_duration_table.size() == number_of_locations * number_of_locations, BOOST_ASSERT_MSG(result_weight_table.size() == number_of_locations * number_of_locations,
"Distance Table has wrong size"); "Weight Table has wrong size");
if (!IsStronglyConnectedComponent(result_duration_table)) if (!IsStronglyConnectedComponent(result_weight_table))
{ {
return Error("NoTrips", "No trip visiting all destinations possible.", result); return Error("NoTrips", "No trip visiting all destinations possible.", result);
} }
if (fixed_start && fixed_end) if (fixed_start && fixed_end)
{ {
ManipulateTableForFSE(source_id, destination_id, result_duration_table); ManipulateTableForFSE(source_id, destination_id, result_weight_table);
} }
std::vector<NodeID> duration_trip; std::vector<NodeID> weight_trip;
duration_trip.reserve(number_of_locations); weight_trip.reserve(number_of_locations);
// get an optimized order in which the destinations should be visited // get an optimized order in which the destinations should be visited
if (number_of_locations < BF_MAX_FEASABLE) if (number_of_locations < BF_MAX_FEASABLE)
{ {
duration_trip = trip::BruteForceTrip(number_of_locations, result_duration_table); weight_trip = trip::BruteForceTrip(number_of_locations, result_weight_table);
} }
else else
{ {
duration_trip = trip::FarthestInsertionTrip(number_of_locations, result_duration_table); weight_trip = trip::FarthestInsertionTrip(number_of_locations, result_weight_table);
} }
// rotate result such that roundtrip starts at node with index 0 // rotate result such that roundtrip starts at node with index 0
// thist first if covers scenarios: !fixed_end || fixed_start || (fixed_start && fixed_end) // thist first if covers scenarios: !fixed_end || fixed_start || (fixed_start && fixed_end)
if (!fixed_end || fixed_start) if (!fixed_end || fixed_start)
{ {
auto desired_start_index = std::find(std::begin(duration_trip), std::end(duration_trip), 0); auto desired_start_index = std::find(std::begin(weight_trip), std::end(weight_trip), 0);
BOOST_ASSERT(desired_start_index != std::end(duration_trip)); BOOST_ASSERT(desired_start_index != std::end(weight_trip));
std::rotate(std::begin(duration_trip), desired_start_index, std::end(duration_trip)); std::rotate(std::begin(weight_trip), desired_start_index, std::end(weight_trip));
} }
else if (fixed_end && !fixed_start && parameters.roundtrip) else if (fixed_end && !fixed_start && parameters.roundtrip)
{ {
auto desired_start_index = auto desired_start_index =
std::find(std::begin(duration_trip), std::end(duration_trip), destination_id); std::find(std::begin(weight_trip), std::end(weight_trip), destination_id);
BOOST_ASSERT(desired_start_index != std::end(duration_trip)); BOOST_ASSERT(desired_start_index != std::end(weight_trip));
std::rotate(std::begin(duration_trip), desired_start_index, std::end(duration_trip)); std::rotate(std::begin(weight_trip), desired_start_index, std::end(weight_trip));
} }
// get the route when visiting all destinations in optimized order // get the route when visiting all destinations in optimized order
InternalRouteResult route = InternalRouteResult route =
ComputeRoute(algorithms, snapped_phantoms, duration_trip, parameters.roundtrip); ComputeRoute(algorithms, snapped_phantoms, weight_trip, parameters.roundtrip);
// get api response // get api response
const std::vector<std::vector<NodeID>> trips = {duration_trip}; const std::vector<std::vector<NodeID>> trips = {std::move(weight_trip)};
const std::vector<InternalRouteResult> routes = {route}; const std::vector<InternalRouteResult> routes = {route};
api::TripAPI trip_api{facade, parameters}; api::TripAPI trip_api{facade, parameters};
trip_api.MakeResponse(trips, routes, snapped_phantoms, result); trip_api.MakeResponse(trips, routes, snapped_phantoms, result);