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

remove dead code, produce empty route when origin and destination are the same

Browse Source
This commit is contained in:
Dennis Luxen 2014-06-24 16:09:25 +02:00
parent 3b2893944c
commit 0c59ecfa14
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
DataStructures/PhantomNodes.h
View File

@ -95,17 +95,6 @@ struct PhantomNode
return result; return result;
} }
void Reset()
{
forward_node_id = SPECIAL_NODEID;
name_id = SPECIAL_NODEID;
forward_weight = INVALID_EDGE_WEIGHT;
reverse_weight = INVALID_EDGE_WEIGHT;
forward_offset = 0;
reverse_offset = 0;
location.Reset();
}
bool isBidirected() const bool isBidirected() const
{ {
return (forward_node_id != SPECIAL_NODEID) && return (forward_node_id != SPECIAL_NODEID) &&
@ -147,32 +136,16 @@ struct PhantomNode
typedef std::vector<std::vector<PhantomNode>> PhantomNodeArray; typedef std::vector<std::vector<PhantomNode>> PhantomNodeArray;
struct PhantomNodeLists
{
std::vector<PhantomNode> source_phantom_list;
std::vector<PhantomNode> target_phantom_list;
};
struct PhantomNodes struct PhantomNodes
{ {
PhantomNode source_phantom; PhantomNode source_phantom;
PhantomNode target_phantom; PhantomNode target_phantom;
void Reset()
{
source_phantom.Reset();
target_phantom.Reset();
}
bool PhantomsAreOnSameNodeBasedEdge() const
{
return (source_phantom.forward_node_id == target_phantom.forward_node_id);
}
bool AtLeastOnePhantomNodeIsInvalid() const
{
return ((source_phantom.forward_node_id == SPECIAL_NODEID) && (source_phantom.reverse_node_id == SPECIAL_NODEID)) ||
((target_phantom.forward_node_id == SPECIAL_NODEID) && (target_phantom.reverse_node_id == SPECIAL_NODEID));
}
bool PhantomNodesHaveEqualLocation() const
{
return source_phantom == target_phantom;
}
}; };
inline std::ostream& operator<<(std::ostream &out, const PhantomNodes & pn) inline std::ostream& operator<<(std::ostream &out, const PhantomNodes & pn)

5
RoutingAlgorithms/AlternativePathRouting.h
View File

@ -76,11 +76,6 @@ template <class DataFacadeT> class AlternativeRouting : private BasicRoutingInte
void operator()(const PhantomNodes &phantom_node_pair, RawRouteData &raw_route_data) void operator()(const PhantomNodes &phantom_node_pair, RawRouteData &raw_route_data)
{ {
if (phantom_node_pair.PhantomNodesHaveEqualLocation())
{
return;
}
std::vector<NodeID> alternative_path; std::vector<NodeID> alternative_path;
std::vector<NodeID> via_node_candidate_list; std::vector<NodeID> via_node_candidate_list;
std::vector<SearchSpaceEdge> forward_search_space; std::vector<SearchSpaceEdge> forward_search_space;