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

replace C-style comments

Browse Source
This commit is contained in:
Dennis Luxen 2015-03-03 17:43:37 +01:00
parent 31cae8f05f
commit b9922bc90b
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data_structures/static_rtree.hpp
View File

@ -793,12 +793,10 @@ class StaticRTree
return !result_phantom_node_vector.empty(); return !result_phantom_node_vector.empty();
} }
/** // Returns elements within max_distance.
* Returns elements within max_distance. // If the minium of elements could not be found in the search radius, widen
* If the minium of elements could not be found in the search radius, widen // it until the minimum can be satisfied.
* it until the minimum can be satisfied. // At the number of returned nodes is capped at the given maximum.
* At the number of returned nodes is capped at the given maximum.
*/
bool IncrementalFindPhantomNodeForCoordinateWithDistance( bool IncrementalFindPhantomNodeForCoordinateWithDistance(
const FixedPointCoordinate &input_coordinate, const FixedPointCoordinate &input_coordinate,
std::vector<std::pair<PhantomNode, double>> &result_phantom_node_vector, std::vector<std::pair<PhantomNode, double>> &result_phantom_node_vector,
@ -904,9 +902,9 @@ class StaticRTree
m_coordinate_list->at(current_segment.v), input_coordinate, m_coordinate_list->at(current_segment.v), input_coordinate,
projected_coordinate, foot_point_coordinate_on_segment, current_ratio); projected_coordinate, foot_point_coordinate_on_segment, current_ratio);
if (number_of_elements_from_big_cc > 0 if (number_of_elements_from_big_cc > 0 &&
&& result_phantom_node_vector.size() >= min_number_of_phantom_nodes result_phantom_node_vector.size() >= min_number_of_phantom_nodes &&
&& current_perpendicular_distance >= max_distance) current_perpendicular_distance >= max_distance)
{ {
traversal_queue = std::priority_queue<IncrementalQueryCandidate>{}; traversal_queue = std::priority_queue<IncrementalQueryCandidate>{};
continue; continue;
@ -914,7 +912,8 @@ class StaticRTree
// store phantom node in result vector // store phantom node in result vector
result_phantom_node_vector.emplace_back( result_phantom_node_vector.emplace_back(
PhantomNode( current_segment.forward_edge_based_node_id, PhantomNode(
current_segment.forward_edge_based_node_id,
current_segment.reverse_edge_based_node_id, current_segment.name_id, current_segment.reverse_edge_based_node_id, current_segment.name_id,
current_segment.forward_weight, current_segment.reverse_weight, current_segment.forward_weight, current_segment.reverse_weight,
current_segment.forward_offset, current_segment.reverse_offset, current_segment.forward_offset, current_segment.reverse_offset,