remove templates from routing algorithms

This commit is contained in:
Moritz Kobitzsch
2017-01-05 12:18:45 +01:00
committed by Patrick Niklaus
parent f2c3b9859e
commit d129b0ef24
20 changed files with 2818 additions and 2551 deletions
+6 -5
View File
@@ -114,9 +114,10 @@ SCC_Component SplitUnaccessibleLocations(const std::size_t number_of_locations,
return SCC_Component(std::move(components), std::move(range));
}
InternalRouteResult TripPlugin::ComputeRoute(const datafacade::BaseDataFacade &facade,
const std::vector<PhantomNode> &snapped_phantoms,
const std::vector<NodeID> &trip) const
InternalRouteResult
TripPlugin::ComputeRoute(const std::shared_ptr<const datafacade::BaseDataFacade> facade,
const std::vector<PhantomNode> &snapped_phantoms,
const std::vector<NodeID> &trip) const
{
InternalRouteResult min_route;
// given he final trip, compute total duration and return the route and location permutation
@@ -175,7 +176,7 @@ Status TripPlugin::HandleRequest(const std::shared_ptr<const datafacade::BaseDat
// compute the duration table of all phantom nodes
const auto result_table = util::DistTableWrapper<EdgeWeight>(
duration_table(*facade, snapped_phantoms, {}, {}), number_of_locations);
duration_table(facade, snapped_phantoms, {}, {}), number_of_locations);
if (result_table.size() == 0)
{
@@ -233,7 +234,7 @@ Status TripPlugin::HandleRequest(const std::shared_ptr<const datafacade::BaseDat
routes.reserve(trips.size());
for (const auto &trip : trips)
{
routes.push_back(ComputeRoute(*facade, snapped_phantoms, trip));
routes.push_back(ComputeRoute(facade, snapped_phantoms, trip));
}
api::TripAPI trip_api{*facade, parameters};