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

migrate DataStructures to C++11

Browse Source
This commit is contained in:
Dennis Luxen
2014-05-07 18:39:16 +02:00
parent 6abbb06ff6
commit e12ad48822
34 changed files with 1147 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RoutingAlgorithms/AlternativePathRouting.h
+2 -2
View File
@@ -315,7 +315,7 @@ public:
// -- unpacked output
raw_route_data.unpacked_path_segments.front()
);
raw_route_data.lengthOfShortestPath = upper_bound_to_shortest_path_distance;
raw_route_data.shortest_path_length = upper_bound_to_shortest_path_distance;
}
if( SPECIAL_NODEID != selected_via_node ) {
@@ -341,7 +341,7 @@ public:
raw_route_data.unpacked_alternative
);
raw_route_data.lengthOfAlternativePath = length_of_via_path;
raw_route_data.alternative_path_length = length_of_via_path;
}
}
RoutingAlgorithms/BasicRoutingInterface.h
+2 -2
View File
@@ -231,8 +231,8 @@ public:
)
);
}
unpacked_path.back().turnInstruction = turn_instruction;
unpacked_path.back().durationOfSegment = ed.distance;
unpacked_path.back().turn_instruction = turn_instruction;
unpacked_path.back().segment_duration = ed.distance;
}
}
}
RoutingAlgorithms/ShortestPathRouting.h
+5 -5
View File
@@ -59,8 +59,8 @@ public:
for (const PhantomNodes & phantom_node_pair : phantom_nodes_vector)
{
if( phantom_node_pair.AtLeastOnePhantomNodeIsInvalid() ) {
// raw_route_data.lengthOfShortestPath = INT_MAX;
// raw_route_data.lengthOfAlternativePath = INT_MAX;
// raw_route_data.shortest_path_length = INT_MAX;
// raw_route_data.alternative_path_length = INT_MAX;
return;
}
}
@@ -212,8 +212,8 @@ public:
(INVALID_EDGE_WEIGHT == local_upper_bound1) &&
(INVALID_EDGE_WEIGHT == local_upper_bound2)
) {
raw_route_data.lengthOfShortestPath = INVALID_EDGE_WEIGHT;
raw_route_data.lengthOfAlternativePath = INVALID_EDGE_WEIGHT;
raw_route_data.shortest_path_length = INVALID_EDGE_WEIGHT;
raw_route_data.alternative_path_length = INVALID_EDGE_WEIGHT;
return;
}
if( SPECIAL_NODEID == middle1 ) {
@@ -393,7 +393,7 @@ public:
raw_route_data.unpacked_path_segments[i]
);
}
raw_route_data.lengthOfShortestPath = std::min(distance1, distance2);
raw_route_data.shortest_path_length = std::min(distance1, distance2);
}
};