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

use float consistently in Contractor

Browse Source
This commit is contained in:
Dennis Luxen 2014-06-18 10:43:26 +02:00
parent bbc0ba147a
commit 011910811b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Contractor/Contractor.h
View File

@ -455,7 +455,7 @@ class Contractor
remaining_nodes.end(), remaining_nodes.end(),
[](RemainingNodeData node_data) [](RemainingNodeData node_data)
{ return !node_data.is_independent; }); { return !node_data.is_independent; });
const int first_independent_node = first - remaining_nodes.begin(); const int first_independent_node = static_cast<int>(first - remaining_nodes.begin());
// contract independent nodes // contract independent nodes
tbb::parallel_for(tbb::blocked_range<int>(first_independent_node, last, ContractGrainSize), tbb::parallel_for(tbb::blocked_range<int>(first_independent_node, last, ContractGrainSize),
@ -716,14 +716,14 @@ class Contractor
float result; float result;
if (0 == (stats.edges_deleted_count * stats.original_edges_deleted_count)) if (0 == (stats.edges_deleted_count * stats.original_edges_deleted_count))
{ {
result = 1 * node_data->depth; result = 1.f * node_data->depth;
} }
else else
{ {
result = 2 * (((float)stats.edges_added_count) / stats.edges_deleted_count) + result = 2.f * (((float)stats.edges_added_count) / stats.edges_deleted_count) +
4 * (((float)stats.original_edges_added_count) / 4.f * (((float)stats.original_edges_added_count) /
stats.original_edges_deleted_count) + stats.original_edges_deleted_count) +
1 * node_data->depth; 1.f * node_data->depth;
} }
BOOST_ASSERT(result >= 0); BOOST_ASSERT(result >= 0);
return result; return result;