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

Fix naming in PhantomNode

Browse Source
This commit is contained in:
Patrick Niklaus 2016-01-05 12:41:16 +01:00
parent 707931125e
commit 1da1fa5a31
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/engine/phantom_node.hpp
View File

@ -81,13 +81,13 @@ struct PhantomNode
int GetReverseWeightPlusOffset() const; int GetReverseWeightPlusOffset() const;
bool is_bidirected() const; bool IsBidirected() const;
bool is_compressed() const; bool IsCompressed() const;
bool is_valid(const unsigned numberOfNodes) const; bool is_valid(const unsigned numberOfNodes) const;
bool is_valid() const; bool IsValid() const;
bool operator==(const PhantomNode &other) const; bool operator==(const PhantomNode &other) const;
}; };

4
include/engine/plugins/match.hpp
View File

@ -353,8 +353,8 @@ template <class DataFacadeT> class MapMatchingPlugin : public BasePlugin
{ {
current_phantom_node_pair.source_phantom = sub.nodes[i]; current_phantom_node_pair.source_phantom = sub.nodes[i];
current_phantom_node_pair.target_phantom = sub.nodes[i + 1]; current_phantom_node_pair.target_phantom = sub.nodes[i + 1];
BOOST_ASSERT(current_phantom_node_pair.source_phantom.is_valid()); BOOST_ASSERT(current_phantom_node_pair.source_phantom.IsValid());
BOOST_ASSERT(current_phantom_node_pair.target_phantom.is_valid()); BOOST_ASSERT(current_phantom_node_pair.target_phantom.IsValid());
raw_route.segment_end_coordinates.emplace_back(current_phantom_node_pair); raw_route.segment_end_coordinates.emplace_back(current_phantom_node_pair);
} }
search_engine_ptr->shortest_path( search_engine_ptr->shortest_path(

2
include/engine/plugins/plugin_base.hpp
View File

@ -68,7 +68,7 @@ class BasePlugin
const auto fallback_to_big_component = const auto fallback_to_big_component =
[](const std::pair<PhantomNode, PhantomNode> &phantom_pair) [](const std::pair<PhantomNode, PhantomNode> &phantom_pair)
{ {
if (phantom_pair.first.component.is_tiny && phantom_pair.second.is_valid() && if (phantom_pair.first.component.is_tiny && phantom_pair.second.IsValid() &&
!phantom_pair.second.component.is_tiny) !phantom_pair.second.component.is_tiny)
{ {
return phantom_pair.second; return phantom_pair.second;

4
include/engine/routing_algorithms/direct_shortest_path.hpp
View File

@ -53,8 +53,8 @@ class DirectShortestPathRouting final
forward_heap.Clear(); forward_heap.Clear();
reverse_heap.Clear(); reverse_heap.Clear();
BOOST_ASSERT(source_phantom.is_valid()); BOOST_ASSERT(source_phantom.IsValid());
BOOST_ASSERT(target_phantom.is_valid()); BOOST_ASSERT(target_phantom.IsValid());
if (source_phantom.forward_node_id != SPECIAL_NODEID) if (source_phantom.forward_node_id != SPECIAL_NODEID)
{ {

6
src/engine/phantom_node.cpp
View File

@ -56,12 +56,12 @@ int PhantomNode::GetReverseWeightPlusOffset() const
return reverse_offset + reverse_weight; return reverse_offset + reverse_weight;
} }
bool PhantomNode::is_bidirected() const bool PhantomNode::IsBidirected() const
{ {
return (forward_node_id != SPECIAL_NODEID) && (reverse_node_id != SPECIAL_NODEID); return (forward_node_id != SPECIAL_NODEID) && (reverse_node_id != SPECIAL_NODEID);
} }
bool PhantomNode::is_compressed() const { return (forward_offset != 0) || (reverse_offset != 0); } bool PhantomNode::IsCompressed() const { return (forward_offset != 0) || (reverse_offset != 0); }
bool PhantomNode::is_valid(const unsigned number_of_nodes) const bool PhantomNode::is_valid(const unsigned number_of_nodes) const
{ {
@ -71,6 +71,6 @@ bool PhantomNode::is_valid(const unsigned number_of_nodes) const
(component.id != INVALID_COMPONENTID) && (name_id != INVALID_NAMEID); (component.id != INVALID_COMPONENTID) && (name_id != INVALID_NAMEID);
} }
bool PhantomNode::is_valid() const { return location.IsValid() && (name_id != INVALID_NAMEID); } bool PhantomNode::IsValid() const { return location.IsValid() && (name_id != INVALID_NAMEID); }
bool PhantomNode::operator==(const PhantomNode &other) const { return location == other.location; } bool PhantomNode::operator==(const PhantomNode &other) const { return location == other.location; }