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

reformat NodeBasedGraph

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-09 14:21:52 +02:00
parent c98eed612a
commit aebe8572f9
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DataStructures/NodeBasedGraph.h
View File

@ -47,16 +47,14 @@ typedef DynamicGraph<NodeBasedEdgeData> NodeBasedDynamicGraph;
inline std::shared_ptr<NodeBasedDynamicGraph> inline std::shared_ptr<NodeBasedDynamicGraph>
NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list) NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list)
{ {
typedef NodeBasedDynamicGraph::InputEdge DynInputEdge;
std::sort(input_edge_list.begin(), input_edge_list.end()); std::sort(input_edge_list.begin(), input_edge_list.end());
// TODO: remove duplicate edges // TODO: remove duplicate edges
DeallocatingVector<DynInputEdge> edges_list; DeallocatingVector<NodeBasedDynamicGraph::InputEdge> edges_list;
DynInputEdge edge; NodeBasedDynamicGraph::InputEdge edge;
for (const ImportEdge &import_edge : input_edge_list) for (const ImportEdge &import_edge : input_edge_list)
{ {
// TODO: give ImportEdge a proper c'tor to use emplace_back's below
if (!import_edge.isForward()) if (!import_edge.isForward())
{ {
edge.source = import_edge.target(); edge.source = import_edge.target();
@ -100,11 +98,10 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge
std::sort(edges_list.begin(), edges_list.end()); std::sort(edges_list.begin(), edges_list.end());
auto graph = std::make_shared<NodeBasedDynamicGraph>(number_of_nodes, edges_list); auto graph = std::make_shared<NodeBasedDynamicGraph>(number_of_nodes, edges_list);
// FIXME probably unneeded since this is the end of scope edges_list.clear();
DeallocatingVector<DynInputEdge>().swap(edges_list);
BOOST_ASSERT(0 == edges_list.size()); BOOST_ASSERT(0 == edges_list.size());
return graph; return graph;
} }
#endif #endif // __NODE_BASED_GRAPH_H__