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

Adjust method and function names

Browse Source
This commit is contained in:
Michael Krasnyk
2017-05-10 23:20:37 +02:00
committed by Patrick Niklaus
parent 9358aa1128
commit 12f47708cd
5 changed files with 80 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/phantom_node.hpp
+23 -23
View File
@@ -55,9 +55,9 @@ struct PhantomNode
forward_duration_offset(0), reverse_duration_offset(0),
packed_geometry_id(SPECIAL_GEOMETRYID), component{INVALID_COMPONENTID, false},
fwd_segment_position(0), forward_travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TRAVEL_MODE_INACCESSIBLE), is_forward_valid_source(false),
is_forward_valid_target(false), is_reverse_valid_source(false),
is_reverse_valid_target(false)
backward_travel_mode(TRAVEL_MODE_INACCESSIBLE), is_valid_forward_source(false),
is_valid_forward_target(false), is_valid_reverse_source(false),
is_valid_reverse_target(false)
{
}
@@ -105,21 +105,21 @@ struct PhantomNode
bool IsValid() const { return location.IsValid() && (name_id != INVALID_NAMEID); }
bool IsForwardValidSource() const
bool IsValidForwardSource() const
{
return forward_segment_id.enabled && is_forward_valid_source;
return forward_segment_id.enabled && is_valid_forward_source;
}
bool IsForwardValidTarget() const
bool IsValidForwardTarget() const
{
return forward_segment_id.enabled && is_forward_valid_target;
return forward_segment_id.enabled && is_valid_forward_target;
}
bool IsReverseValidSource() const
bool IsValidReverseSource() const
{
return reverse_segment_id.enabled && is_reverse_valid_source;
return reverse_segment_id.enabled && is_valid_reverse_source;
}
bool IsReverseValidTarget() const
bool IsValidReverseTarget() const
{
return reverse_segment_id.enabled && is_reverse_valid_target;
return reverse_segment_id.enabled && is_valid_reverse_target;
}
bool operator==(const PhantomNode &other) const { return location == other.location; }
@@ -134,10 +134,10 @@ struct PhantomNode
EdgeWeight reverse_duration,
EdgeWeight forward_duration_offset,
EdgeWeight reverse_duration_offset,
bool is_forward_valid_source,
bool is_forward_valid_target,
bool is_reverse_valid_source,
bool is_reverse_valid_target,
bool is_valid_forward_source,
bool is_valid_forward_target,
bool is_valid_reverse_source,
bool is_valid_reverse_target,
const util::Coordinate location,
const util::Coordinate input_location)
: forward_segment_id{other.forward_segment_id},
@@ -152,10 +152,10 @@ struct PhantomNode
input_location{input_location}, fwd_segment_position{other.fwd_segment_position},
forward_travel_mode{other.forward_travel_mode},
backward_travel_mode{other.backward_travel_mode},
is_forward_valid_source{is_forward_valid_source},
is_forward_valid_target{is_forward_valid_target},
is_reverse_valid_source{is_reverse_valid_source},
is_reverse_valid_target{is_reverse_valid_target}
is_valid_forward_source{is_valid_forward_source},
is_valid_forward_target{is_valid_forward_target},
is_valid_reverse_source{is_valid_reverse_source},
is_valid_reverse_target{is_valid_reverse_target}
{
}
@@ -187,10 +187,10 @@ struct PhantomNode
extractor::TravelMode backward_travel_mode : 4;
// is phantom node valid to be used as source or target
private:
bool is_forward_valid_source : 1;
bool is_forward_valid_target : 1;
bool is_reverse_valid_source : 1;
bool is_reverse_valid_target : 1;
bool is_valid_forward_source : 1;
bool is_valid_forward_target : 1;
bool is_valid_reverse_source : 1;
bool is_valid_reverse_target : 1;
};
static_assert(sizeof(PhantomNode) == 72, "PhantomNode has more padding then expected");
include/engine/routing_algorithms/routing_base.hpp
+8 -27
View File
@@ -41,43 +41,24 @@ bool needsLoopForward(const PhantomNode &source_phantom, const PhantomNode &targ
bool needsLoopBackwards(const PhantomNode &source_phantom, const PhantomNode &target_phantom);
template <bool DIRECTION>
void insertNodesInHeap(SearchEngineData<ch::Algorithm>::ManyToManyQueryHeap &heap,
const PhantomNode &phantom_node)
{
BOOST_ASSERT(phantom_node.IsValid());
void insertSourceInHeap(SearchEngineData<ch::Algorithm>::ManyToManyQueryHeap &heap,
const PhantomNode &phantom_node);
const auto weight_sign = DIRECTION == FORWARD_DIRECTION ? -1 : 1;
if ((DIRECTION == FORWARD_DIRECTION && phantom_node.IsForwardValidSource()) ||
(DIRECTION == REVERSE_DIRECTION && phantom_node.IsForwardValidTarget()))
{
heap.Insert(
phantom_node.forward_segment_id.id,
weight_sign * phantom_node.GetForwardWeightPlusOffset(),
{phantom_node.forward_segment_id.id, weight_sign * phantom_node.GetForwardDuration()});
}
if ((DIRECTION == FORWARD_DIRECTION && phantom_node.IsReverseValidSource()) ||
(DIRECTION == REVERSE_DIRECTION && phantom_node.IsReverseValidTarget()))
{
heap.Insert(
phantom_node.reverse_segment_id.id,
weight_sign * phantom_node.GetReverseWeightPlusOffset(),
{phantom_node.reverse_segment_id.id, weight_sign * phantom_node.GetReverseDuration()});
}
}
void insertTargetInHeap(SearchEngineData<ch::Algorithm>::ManyToManyQueryHeap &heap,
const PhantomNode &phantom_node);
template <typename Heap>
void insertNodesInHeaps(Heap &forward_heap, Heap &reverse_heap, const PhantomNodes &nodes)
{
const auto &source = nodes.source_phantom;
if (source.IsForwardValidSource())
if (source.IsValidForwardSource())
{
forward_heap.Insert(source.forward_segment_id.id,
-source.GetForwardWeightPlusOffset(),
source.forward_segment_id.id);
}
if (source.IsReverseValidSource())
if (source.IsValidReverseSource())
{
forward_heap.Insert(source.reverse_segment_id.id,
-source.GetReverseWeightPlusOffset(),
@@ -85,14 +66,14 @@ void insertNodesInHeaps(Heap &forward_heap, Heap &reverse_heap, const PhantomNod
}
const auto &target = nodes.target_phantom;
if (target.IsForwardValidTarget())
if (target.IsValidForwardTarget())
{
reverse_heap.Insert(target.forward_segment_id.id,
target.GetForwardWeightPlusOffset(),
target.forward_segment_id.id);
}
if (target.IsReverseValidTarget())
if (target.IsValidReverseTarget())
{
reverse_heap.Insert(target.reverse_segment_id.id,
target.GetReverseWeightPlusOffset(),