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

Cleanup.

Browse Source
This commit is contained in:
Daniel Patterson 2016-03-03 19:27:36 -08:00
parent 27babfec3d
commit 9bd2446901
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/extractor/edge_based_graph_factory.cpp
View File

@ -127,15 +127,19 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI
BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_1)); BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_1));
BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_2)); BOOST_ASSERT(m_compressed_edge_container.HasEntryForID(edge_id_2));
const auto &forward_geometry = m_compressed_edge_container.GetBucketReference(edge_id_1); const auto &forward_geometry = m_compressed_edge_container.GetBucketReference(edge_id_1);
const auto &reverse_geometry = m_compressed_edge_container.GetBucketReference(edge_id_2);
BOOST_ASSERT(forward_geometry.size() == reverse_geometry.size());
BOOST_ASSERT(0 != forward_geometry.size());
const unsigned geometry_size = static_cast<unsigned>(forward_geometry.size()); const unsigned geometry_size = static_cast<unsigned>(forward_geometry.size());
// There should always be some geometry
BOOST_ASSERT(0 != geometry_size);
// If there is more than one, this is a compressed geometry
if (geometry_size > 1) if (geometry_size > 1)
{ {
NodeID current_edge_source_coordinate_id = node_u; NodeID current_edge_source_coordinate_id = node_u;
const auto &reverse_geometry = m_compressed_edge_container.GetBucketReference(edge_id_2);
BOOST_ASSERT(forward_geometry.size() == reverse_geometry.size());
// traverse arrays from start and end respectively // traverse arrays from start and end respectively
for (const auto i : util::irange(0u, geometry_size)) for (const auto i : util::irange(0u, geometry_size))
{ {
@ -165,10 +169,9 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI
BOOST_ASSERT(current_edge_source_coordinate_id == node_v); BOOST_ASSERT(current_edge_source_coordinate_id == node_v);
} }
// Otherwise, it's an uncompressed (single-segment) geometry
else else
{ {
//BOOST_ASSERT(!m_compressed_edge_container.HasEntryForID(edge_id_2));
if (forward_data.edge_id != SPECIAL_NODEID) if (forward_data.edge_id != SPECIAL_NODEID)
{ {
BOOST_ASSERT(!forward_data.reversed); BOOST_ASSERT(!forward_data.reversed);
@ -190,9 +193,6 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const NodeI
BOOST_ASSERT(forward_data.edge_id != SPECIAL_NODEID || BOOST_ASSERT(forward_data.edge_id != SPECIAL_NODEID ||
reverse_data.edge_id != SPECIAL_NODEID); reverse_data.edge_id != SPECIAL_NODEID);
//m_compressed_edge_container.AddUncompressedEdge(edge_id_1, node_v, forward_data.distance);
//m_compressed_edge_container.AddUncompressedEdge(edge_id_2, node_u, reverse_data.distance);
m_edge_based_node_list.emplace_back( m_edge_based_node_list.emplace_back(
forward_data.edge_id, reverse_data.edge_id, node_u, node_v, forward_data.name_id, forward_data.edge_id, reverse_data.edge_id, node_u, node_v, forward_data.name_id,
m_compressed_edge_container.GetPositionForID(edge_id_1), m_compressed_edge_container.GetPositionForID(edge_id_1),