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

Fix formating

Browse Source
This commit is contained in:
Patrick Niklaus 2018-02-07 23:21:55 +00:00 committed by Patrick Niklaus
parent bee3bdb576
commit 26e5c4eae2
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/benchmarks/alias.cpp
View File

@ -50,7 +50,7 @@ int main(int, char **)
TIMER_START(aliased_u32); TIMER_START(aliased_u32);
for (auto round : util::irange(0, num_rounds)) for (auto round : util::irange(0, num_rounds))
{ {
(void) round; (void)round;
osrm_uint32 sum{0}; osrm_uint32 sum{0};
osrm_uint32 mult{1}; osrm_uint32 mult{1};
for (auto idx : indices) for (auto idx : indices)
@ -69,7 +69,7 @@ int main(int, char **)
TIMER_START(plain_u32); TIMER_START(plain_u32);
for (auto round : util::irange(0, num_rounds)) for (auto round : util::irange(0, num_rounds))
{ {
(void) round; (void)round;
std::uint32_t sum{0}; std::uint32_t sum{0};
std::uint32_t mult{1}; std::uint32_t mult{1};
for (auto idx : indices) for (auto idx : indices)
@ -88,7 +88,7 @@ int main(int, char **)
TIMER_START(aliased_double); TIMER_START(aliased_double);
for (auto round : util::irange(0, num_rounds)) for (auto round : util::irange(0, num_rounds))
{ {
(void) round; (void)round;
osrm_double sum{0.0}; osrm_double sum{0.0};
osrm_double mult{1.0}; osrm_double mult{1.0};
for (auto idx : indices) for (auto idx : indices)
@ -108,7 +108,7 @@ int main(int, char **)
TIMER_START(plain_double); TIMER_START(plain_double);
for (auto round : util::irange(0, num_rounds)) for (auto round : util::irange(0, num_rounds))
{ {
(void) round; (void)round;
double sum{0.0}; double sum{0.0};
double mult{1.0}; double mult{1.0};
for (auto idx : indices) for (auto idx : indices)

24
src/extractor/compressed_edge_container.cpp
View File

@ -103,17 +103,16 @@ SegmentDuration CompressedEdgeContainer::ClipDuration(const SegmentDuration dura
// ----------> via_node_id -----------> target_node_id // ----------> via_node_id -----------> target_node_id
// weight_1 weight_2 // weight_1 weight_2
// duration_1 duration_2 // duration_1 duration_2
void CompressedEdgeContainer::CompressEdge( void CompressedEdgeContainer::CompressEdge(const EdgeID edge_id_1,
const EdgeID edge_id_1, const EdgeID edge_id_2,
const EdgeID edge_id_2, const NodeID via_node_id,
const NodeID via_node_id, const NodeID target_node_id,
const NodeID target_node_id, const EdgeWeight weight1,
const EdgeWeight weight1, const EdgeWeight weight2,
const EdgeWeight weight2, const EdgeDuration duration1,
const EdgeDuration duration1, const EdgeDuration duration2,
const EdgeDuration duration2, const EdgeWeight node_weight_penalty,
const EdgeWeight node_weight_penalty, const EdgeDuration node_duration_penalty)
const EdgeDuration node_duration_penalty)
{ {
// remove super-trivial geometries // remove super-trivial geometries
BOOST_ASSERT(SPECIAL_EDGEID != edge_id_1); BOOST_ASSERT(SPECIAL_EDGEID != edge_id_1);
@ -169,7 +168,8 @@ void CompressedEdgeContainer::CompressEdge(
// if the via-node offers a penalty, we add the weight of the penalty as an artificial // if the via-node offers a penalty, we add the weight of the penalty as an artificial
// segment that references SPECIAL_NODEID // segment that references SPECIAL_NODEID
if (node_weight_penalty != INVALID_EDGE_WEIGHT && node_duration_penalty != MAXIMAL_EDGE_DURATION) if (node_weight_penalty != INVALID_EDGE_WEIGHT &&
node_duration_penalty != MAXIMAL_EDGE_DURATION)
{ {
edge_bucket_list1.emplace_back(OnewayCompressedEdge{ edge_bucket_list1.emplace_back(OnewayCompressedEdge{
via_node_id, ClipWeight(node_weight_penalty), ClipDuration(node_duration_penalty)}); via_node_id, ClipWeight(node_weight_penalty), ClipDuration(node_duration_penalty)});

3
src/extractor/graph_compressor.cpp
View File

@ -277,7 +277,8 @@ void GraphCompressor::Compress(
graph.GetEdgeData(forward_e1).duration += forward_duration2; graph.GetEdgeData(forward_e1).duration += forward_duration2;
graph.GetEdgeData(reverse_e1).duration += reverse_duration2; graph.GetEdgeData(reverse_e1).duration += reverse_duration2;
if (node_weight_penalty != INVALID_EDGE_WEIGHT && node_duration_penalty != MAXIMAL_EDGE_DURATION) if (node_weight_penalty != INVALID_EDGE_WEIGHT &&
node_duration_penalty != MAXIMAL_EDGE_DURATION)
{ {
graph.GetEdgeData(forward_e1).weight += node_weight_penalty; graph.GetEdgeData(forward_e1).weight += node_weight_penalty;
graph.GetEdgeData(reverse_e1).weight += node_weight_penalty; graph.GetEdgeData(reverse_e1).weight += node_weight_penalty;

3
unit_tests/util/static_graph.cpp
View File

@ -62,7 +62,8 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1); std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1);
for (unsigned i = 0; i < NUM_EDGES; i++) for (unsigned i = 0; i < NUM_EDGES; i++)
{ {
edges.emplace_back(TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), {EdgeID{i}}}); edges.emplace_back(
TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), {EdgeID{i}}});
} }
for (unsigned i = 0; i < NUM_NODES; i++) for (unsigned i = 0; i < NUM_NODES; i++)