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

Fix comments in edge based graph factory

Browse Source
This commit is contained in:
Patrick Niklaus 2015-06-16 11:21:38 +02:00
parent 373fa7a7d9
commit bdbc60b4f7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contractor/edge_based_graph_factory.cpp
View File

@ -193,15 +193,16 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u,
{ {
BOOST_ASSERT(forward_data.forward); BOOST_ASSERT(forward_data.forward);
} }
else
{
BOOST_ASSERT(!forward_data.forward);
}
if (reverse_data.edgeBasedNodeID != SPECIAL_NODEID) if (reverse_data.edgeBasedNodeID != SPECIAL_NODEID)
{ {
BOOST_ASSERT(reverse_data.forward); BOOST_ASSERT(reverse_data.forward);
} }
if (forward_data.edgeBasedNodeID == SPECIAL_NODEID) else
{
BOOST_ASSERT(!forward_data.forward);
}
if (reverse_data.edgeBasedNodeID == SPECIAL_NODEID)
{ {
BOOST_ASSERT(!reverse_data.forward); BOOST_ASSERT(!reverse_data.forward);
} }
@ -433,9 +434,8 @@ void EdgeBasedGraphFactory::CompressGeometry()
<< new_edge_count / (double)original_number_of_edges; << new_edge_count / (double)original_number_of_edges;
} }
/** /// Renumbers all _forward_ edges and sets the edgeBasedNodeID.
* Writes the id of the edge in the edge expanded graph (into the edge in the node based graph) /// A specific numbering is not important. Any unique ID will do.
*/
void EdgeBasedGraphFactory::RenumberEdges() void EdgeBasedGraphFactory::RenumberEdges()
{ {
// renumber edge based node of outgoing edges // renumber edge based node of outgoing edges
@ -498,7 +498,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
const NodeID node_v = m_node_based_graph->GetTarget(e1); const NodeID node_v = m_node_based_graph->GetTarget(e1);
BOOST_ASSERT(SPECIAL_NODEID != node_v); BOOST_ASSERT(SPECIAL_NODEID != node_v);
// pick only every other edge // pick only every other edge, since we have every edge as an outgoing
// and incoming egde
if (node_u > node_v) if (node_u > node_v)
{ {
continue; continue;
@ -524,6 +525,7 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
const bool component_is_tiny = size_of_component < 1000; const bool component_is_tiny = size_of_component < 1000;
// we only set edgeBasedNodeID for forward edges
if (edge_data.edgeBasedNodeID == SPECIAL_NODEID) if (edge_data.edgeBasedNodeID == SPECIAL_NODEID)
{ {
InsertEdgeBasedNode(node_v, node_u, InsertEdgeBasedNode(node_v, node_u,