diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp index 484526674..17dd6d19a 100644 --- a/include/engine/phantom_node.hpp +++ b/include/engine/phantom_node.hpp @@ -81,13 +81,13 @@ struct PhantomNode 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; + bool IsValid() const; bool operator==(const PhantomNode &other) const; }; diff --git a/include/engine/plugins/match.hpp b/include/engine/plugins/match.hpp index 2f5dc688d..cd3ad1159 100644 --- a/include/engine/plugins/match.hpp +++ b/include/engine/plugins/match.hpp @@ -353,8 +353,8 @@ template class MapMatchingPlugin : public BasePlugin { current_phantom_node_pair.source_phantom = sub.nodes[i]; 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.target_phantom.is_valid()); + BOOST_ASSERT(current_phantom_node_pair.source_phantom.IsValid()); + BOOST_ASSERT(current_phantom_node_pair.target_phantom.IsValid()); raw_route.segment_end_coordinates.emplace_back(current_phantom_node_pair); } search_engine_ptr->shortest_path( diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp index 7301d44c6..5dffedd01 100644 --- a/include/engine/plugins/plugin_base.hpp +++ b/include/engine/plugins/plugin_base.hpp @@ -68,7 +68,7 @@ class BasePlugin const auto fallback_to_big_component = [](const std::pair &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) { return phantom_pair.second; diff --git a/include/engine/routing_algorithms/direct_shortest_path.hpp b/include/engine/routing_algorithms/direct_shortest_path.hpp index 37b5a4a23..42bc357ff 100644 --- a/include/engine/routing_algorithms/direct_shortest_path.hpp +++ b/include/engine/routing_algorithms/direct_shortest_path.hpp @@ -53,8 +53,8 @@ class DirectShortestPathRouting final forward_heap.Clear(); reverse_heap.Clear(); - BOOST_ASSERT(source_phantom.is_valid()); - BOOST_ASSERT(target_phantom.is_valid()); + BOOST_ASSERT(source_phantom.IsValid()); + BOOST_ASSERT(target_phantom.IsValid()); if (source_phantom.forward_node_id != SPECIAL_NODEID) { diff --git a/src/engine/phantom_node.cpp b/src/engine/phantom_node.cpp index 7281d57bf..670ffe706 100644 --- a/src/engine/phantom_node.cpp +++ b/src/engine/phantom_node.cpp @@ -56,12 +56,12 @@ int PhantomNode::GetReverseWeightPlusOffset() const 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); } -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 { @@ -71,6 +71,6 @@ bool PhantomNode::is_valid(const unsigned number_of_nodes) const (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; }