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

fix check for invalid phantom nodes (20 failed left)

Browse Source
This commit is contained in:
Dennis Luxen 2014-03-25 17:48:25 +01:00
parent 776ac3bb2a
commit 2861bacd2a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataStructures/PhantomNodes.h
View File

@ -113,7 +113,7 @@ struct PhantomNode {
};
struct PhantomNodes {
//TODO: rename to lower-case non-camel
//TODO: rename to lower-case non-camel source_*,target_*
PhantomNode startPhantom;
PhantomNode targetPhantom;
void Reset() {
@ -125,9 +125,9 @@ struct PhantomNodes {
return (startPhantom.forward_node_id == targetPhantom.forward_node_id);
}
//TODO: Rename to: BothPhantomNodesAreInvalid
bool AtLeastOnePhantomNodeIsUINTMAX() const {
return (startPhantom.forward_node_id == SPECIAL_NODEID) && (targetPhantom.reverse_node_id == SPECIAL_NODEID);
bool AtLeastOnePhantomNodeIsInvalid() const {
return ((startPhantom.forward_node_id == SPECIAL_NODEID) && (startPhantom.reverse_node_id == SPECIAL_NODEID)) ||
((targetPhantom.forward_node_id == SPECIAL_NODEID) && (targetPhantom.reverse_node_id == SPECIAL_NODEID));
}
bool PhantomNodesHaveEqualLocation() const {

2
RoutingAlgorithms/AlternativePathRouting.h
View File

@ -87,7 +87,7 @@ public:
RawRouteData & raw_route_data
) {
SimpleLogger().Write(logDEBUG) << "alt path routing";
if( //phantom_node_pair.AtLeastOnePhantomNodeIsUINTMAX() ||
if( //phantom_node_pair.AtLeastOnePhantomNodeIsInvalid() ||
phantom_node_pair.PhantomNodesHaveEqualLocation()
) {
// raw_route_data.lengthOfShortestPath = INVALID_EDGE_WEIGHT;

2
RoutingAlgorithms/ShortestPathRouting.h
View File

@ -60,7 +60,7 @@ public:
const PhantomNodes & phantom_node_pair,
phantom_nodes_vector
){
if( phantom_node_pair.AtLeastOnePhantomNodeIsUINTMAX() ) {
if( phantom_node_pair.AtLeastOnePhantomNodeIsInvalid() ) {
// raw_route_data.lengthOfShortestPath = INT_MAX;
// raw_route_data.lengthOfAlternativePath = INT_MAX;
SimpleLogger().Write(logDEBUG) << "returning early";