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

Non-explicit constructor and hash-functions.

Browse Source
This commit is contained in:
dmbreaker 2014-06-26 12:14:25 +04:00 committed by Dennis Luxen
parent 05ac4b5ab6
commit 25080aaf1d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataStructures/RestrictionMap.cpp
View File

@ -46,7 +46,7 @@ RestrictionMap::RestrictionMap(const std::shared_ptr<NodeBasedDynamicGraph> &gra
m_restriction_start_nodes.insert(restriction.fromNode); m_restriction_start_nodes.insert(restriction.fromNode);
m_no_turn_via_node_set.insert(restriction.viaNode); m_no_turn_via_node_set.insert(restriction.viaNode);
RestrictionSource restriction_source{restriction.fromNode, restriction.viaNode}; RestrictionSource restriction_source = {restriction.fromNode, restriction.viaNode};
unsigned index; unsigned index;
auto restriction_iter = m_restriction_map.find(restriction_source); auto restriction_iter = m_restriction_map.find(restriction_source);
@ -106,7 +106,7 @@ void RestrictionMap::FixupArrivingTurnRestriction(const NodeID node_u,
for (const NodeID node_x : predecessors) for (const NodeID node_x : predecessors)
{ {
const auto restriction_iterator = m_restriction_map.find(RestrictionSource{node_x, node_u}); const auto restriction_iterator = m_restriction_map.find({node_x, node_u});
if (restriction_iterator == m_restriction_map.end()) if (restriction_iterator == m_restriction_map.end())
{ {
continue; continue;
@ -138,7 +138,7 @@ void RestrictionMap::FixupStartingTurnRestriction(const NodeID node_u,
return; return;
} }
const auto restriction_iterator = m_restriction_map.find(RestrictionSource{node_v, node_w}); const auto restriction_iterator = m_restriction_map.find({node_v, node_w});
if (restriction_iterator != m_restriction_map.end()) if (restriction_iterator != m_restriction_map.end())
{ {
const unsigned index = restriction_iterator->second; const unsigned index = restriction_iterator->second;
@ -146,7 +146,7 @@ void RestrictionMap::FixupStartingTurnRestriction(const NodeID node_u,
m_restriction_map.erase(restriction_iterator); m_restriction_map.erase(restriction_iterator);
m_restriction_start_nodes.emplace(node_u); m_restriction_start_nodes.emplace(node_u);
// insert new restriction start (u,w) (pointing to index) // insert new restriction start (u,w) (pointing to index)
RestrictionSource new_source{node_u, node_w}; RestrictionSource new_source = {node_u, node_w};
m_restriction_map.emplace(new_source, index); m_restriction_map.emplace(new_source, index);
} }
} }
@ -164,7 +164,7 @@ NodeID RestrictionMap::CheckForEmanatingIsOnlyTurn(const NodeID node_u,
return SPECIAL_NODEID; return SPECIAL_NODEID;
} }
auto restriction_iter = m_restriction_map.find(RestrictionSource{node_u, node_v}); auto restriction_iter = m_restriction_map.find({node_u, node_v});
if (restriction_iter != m_restriction_map.end()) if (restriction_iter != m_restriction_map.end())
{ {
const unsigned index = restriction_iter->second; const unsigned index = restriction_iter->second;
@ -196,7 +196,7 @@ bool RestrictionMap::CheckIfTurnIsRestricted(const NodeID node_u,
return false; return false;
} }
auto restriction_iter = m_restriction_map.find(RestrictionSource{node_u, node_v}); auto restriction_iter = m_restriction_map.find({node_u, node_v});
if (restriction_iter != m_restriction_map.end()) if (restriction_iter != m_restriction_map.end())
{ {
const unsigned index = restriction_iter->second; const unsigned index = restriction_iter->second;

6
DataStructures/RestrictionMap.h
View File

@ -45,7 +45,7 @@ struct RestrictionSource
NodeID start_node; NodeID start_node;
NodeID via_node; NodeID via_node;
explicit RestrictionSource(NodeID start, NodeID via) RestrictionSource(NodeID start, NodeID via)
: start_node(start), via_node(via) {} : start_node(start), via_node(via) {}
friend inline bool operator==(const RestrictionSource& lhs, const RestrictionSource& rhs) friend inline bool operator==(const RestrictionSource& lhs, const RestrictionSource& rhs)
@ -74,7 +74,7 @@ namespace std
{ {
size_t operator()(const RestrictionSource &r_source) const size_t operator()(const RestrictionSource &r_source) const
{ {
return std::hash<int>()(r_source.start_node) ^ std::hash<int>()(r_source.via_node); return hash_val(r_source.start_node, r_source.via_node);
} }
}; };
@ -82,7 +82,7 @@ namespace std
{ {
size_t operator()(const RestrictionTarget &r_target) const size_t operator()(const RestrictionTarget &r_target) const
{ {
return std::hash<int>()(r_target.target_node) ^ std::hash<bool>()(r_target.is_only); return hash_val(r_target.target_node, r_target.is_only);
} }
}; };
} }