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

Fix naming convention in GraphContractor

Browse Source
This commit is contained in:
Patrick Niklaus 2016-04-29 00:05:54 +02:00
parent 346146d834
commit d078ed67ca
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/contractor/graph_contractor.hpp
View File

@ -115,7 +115,7 @@ class GraphContractor
{ {
explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {} explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
inline ContractorThreadData *getThreadData() inline ContractorThreadData *GetThreadData()
{ {
bool exists = false; bool exists = false;
auto &ref = data.local(exists); auto &ref = data.local(exists);
@ -302,7 +302,7 @@ class GraphContractor
[this, &node_priorities, &node_depth, [this, &node_priorities, &node_depth,
&thread_data_list](const tbb::blocked_range<int> &range) &thread_data_list](const tbb::blocked_range<int> &range)
{ {
ContractorThreadData *data = thread_data_list.getThreadData(); ContractorThreadData *data = thread_data_list.GetThreadData();
for (int x = range.begin(), end = range.end(); x != end; ++x) for (int x = range.begin(), end = range.end(); x != end; ++x)
{ {
node_priorities[x] = node_priorities[x] =
@ -424,7 +424,7 @@ class GraphContractor
[this, &node_priorities, &remaining_nodes, [this, &node_priorities, &remaining_nodes,
&thread_data_list](const tbb::blocked_range<std::size_t> &range) &thread_data_list](const tbb::blocked_range<std::size_t> &range)
{ {
ContractorThreadData *data = thread_data_list.getThreadData(); ContractorThreadData *data = thread_data_list.GetThreadData();
// determine independent node set // determine independent node set
for (auto i = range.begin(), end = range.end(); i != end; ++i) for (auto i = range.begin(), end = range.end(); i != end; ++i)
{ {
@ -481,7 +481,7 @@ class GraphContractor
[this, &remaining_nodes, [this, &remaining_nodes,
&thread_data_list](const tbb::blocked_range<std::size_t> &range) &thread_data_list](const tbb::blocked_range<std::size_t> &range)
{ {
ContractorThreadData *data = thread_data_list.getThreadData(); ContractorThreadData *data = thread_data_list.GetThreadData();
for (int position = range.begin(), end = range.end(); for (int position = range.begin(), end = range.end();
position != end; ++position) position != end; ++position)
{ {
@ -495,7 +495,7 @@ class GraphContractor
DeleteGrainSize), DeleteGrainSize),
[this, &remaining_nodes, &thread_data_list](const tbb::blocked_range<int> &range) [this, &remaining_nodes, &thread_data_list](const tbb::blocked_range<int> &range)
{ {
ContractorThreadData *data = thread_data_list.getThreadData(); ContractorThreadData *data = thread_data_list.GetThreadData();
for (int position = range.begin(), end = range.end(); position != end; for (int position = range.begin(), end = range.end(); position != end;
++position) ++position)
{ {
@ -547,7 +547,7 @@ class GraphContractor
[this, &node_priorities, &remaining_nodes, &node_depth, [this, &node_priorities, &remaining_nodes, &node_depth,
&thread_data_list](const tbb::blocked_range<int> &range) &thread_data_list](const tbb::blocked_range<int> &range)
{ {
ContractorThreadData *data = thread_data_list.getThreadData(); ContractorThreadData *data = thread_data_list.GetThreadData();
for (int position = range.begin(), end = range.end(); position != end; for (int position = range.begin(), end = range.end(); position != end;
++position) ++position)
{ {
@ -710,9 +710,9 @@ class GraphContractor
inline void Dijkstra(const int max_distance, inline void Dijkstra(const int max_distance,
const unsigned number_of_targets, const unsigned number_of_targets,
const int maxNodes, const int max_nodes,
ContractorThreadData &data, ContractorThreadData &data,
const NodeID middleNode) const NodeID middle_node)
{ {
ContractorHeap &heap = data.heap; ContractorHeap &heap = data.heap;
@ -723,7 +723,7 @@ class GraphContractor
{ {
const NodeID node = heap.DeleteMin(); const NodeID node = heap.DeleteMin();
const auto distance = heap.GetKey(node); const auto distance = heap.GetKey(node);
if (++nodes > maxNodes) if (++nodes > max_nodes)
{ {
return; return;
} }
@ -742,7 +742,7 @@ class GraphContractor
} }
} }
RelaxNode(node, middleNode, distance, heap); RelaxNode(node, middle_node, distance, heap);
} }
} }
@ -1032,7 +1032,7 @@ class GraphContractor
} }
// tie breaking // tie breaking
if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() && if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
bias(node, target)) Bias(node, target))
{ {
return false; return false;
} }
@ -1061,7 +1061,7 @@ class GraphContractor
} }
// tie breaking // tie breaking
if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() && if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
bias(node, target)) Bias(node, target))
{ {
return false; return false;
} }
@ -1071,7 +1071,7 @@ class GraphContractor
} }
// This bias function takes up 22 assembly instructions in total on X86 // This bias function takes up 22 assembly instructions in total on X86
inline bool bias(const NodeID a, const NodeID b) const inline bool Bias(const NodeID a, const NodeID b) const
{ {
const unsigned short hasha = fast_hash(a); const unsigned short hasha = fast_hash(a);
const unsigned short hashb = fast_hash(b); const unsigned short hashb = fast_hash(b);