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

remove templates from routing algorithms

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/plugins/match.hpp
+2 -2
View File
@@ -39,8 +39,8 @@ class MatchPlugin : public BasePlugin
private:
mutable SearchEngineData heaps;
mutable routing_algorithms::MapMatching<datafacade::BaseDataFacade> map_matching;
mutable routing_algorithms::ShortestPathRouting<datafacade::BaseDataFacade> shortest_path;
mutable routing_algorithms::MapMatching map_matching;
mutable routing_algorithms::ShortestPathRouting shortest_path;
const int max_locations_map_matching;
};
}
include/engine/plugins/table.hpp
+1 -1
View File
@@ -26,7 +26,7 @@ class TablePlugin final : public BasePlugin
private:
mutable SearchEngineData heaps;
mutable routing_algorithms::ManyToManyRouting<datafacade::BaseDataFacade> distance_table;
mutable routing_algorithms::ManyToManyRouting distance_table;
const int max_locations_distance_table;
};
}
include/engine/plugins/trip.hpp
+3 -3
View File
@@ -30,11 +30,11 @@ class TripPlugin final : public BasePlugin
{
private:
mutable SearchEngineData heaps;
mutable routing_algorithms::ShortestPathRouting<datafacade::BaseDataFacade> shortest_path;
mutable routing_algorithms::ManyToManyRouting<datafacade::BaseDataFacade> duration_table;
mutable routing_algorithms::ShortestPathRouting shortest_path;
mutable routing_algorithms::ManyToManyRouting duration_table;
const int max_locations_trip;
InternalRouteResult ComputeRoute(const datafacade::BaseDataFacade &facade,
InternalRouteResult ComputeRoute(const std::shared_ptr<const datafacade::BaseDataFacade> facade,
const std::vector<PhantomNode> &phantom_node_list,
const std::vector<NodeID> &trip) const;
include/engine/plugins/viaroute.hpp
+3 -4
View File
@@ -29,10 +29,9 @@ class ViaRoutePlugin final : public BasePlugin
{
private:
mutable SearchEngineData heaps;
mutable routing_algorithms::ShortestPathRouting<datafacade::BaseDataFacade> shortest_path;
mutable routing_algorithms::AlternativeRouting<datafacade::BaseDataFacade> alternative_path;
mutable routing_algorithms::DirectShortestPathRouting<datafacade::BaseDataFacade>
direct_shortest_path;
mutable routing_algorithms::ShortestPathRouting shortest_path;
mutable routing_algorithms::AlternativeRouting alternative_path;
mutable routing_algorithms::DirectShortestPathRouting direct_shortest_path;
const int max_locations_viaroute;
public: