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

fix unintended float/epsilon<double> comparison

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-23 11:49:02 +01:00
parent 62f2a42f28
commit ccd803416e
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
descriptors/description_factory.cpp
View File

@ -44,9 +44,8 @@ void DescriptionFactory::SetStartSegment(const PhantomNode &source, const bool t
(traversed_in_reverse ? source.reverse_weight : source.forward_weight); (traversed_in_reverse ? source.reverse_weight : source.forward_weight);
const TravelMode travel_mode = const TravelMode travel_mode =
(traversed_in_reverse ? source.backward_travel_mode : source.forward_travel_mode); (traversed_in_reverse ? source.backward_travel_mode : source.forward_travel_mode);
AppendSegment( AppendSegment(source.location, PathData(0, source.name_id, TurnInstruction::HeadOn,
source.location, segment_duration, travel_mode));
PathData(0, source.name_id, TurnInstruction::HeadOn, segment_duration, travel_mode));
BOOST_ASSERT(path_description.back().duration == segment_duration); BOOST_ASSERT(path_description.back().duration == segment_duration);
} }
@ -59,15 +58,10 @@ void DescriptionFactory::SetEndSegment(const PhantomNode &target,
(traversed_in_reverse ? target.reverse_weight : target.forward_weight); (traversed_in_reverse ? target.reverse_weight : target.forward_weight);
const TravelMode travel_mode = const TravelMode travel_mode =
(traversed_in_reverse ? target.backward_travel_mode : target.forward_travel_mode); (traversed_in_reverse ? target.backward_travel_mode : target.forward_travel_mode);
path_description.emplace_back(target.location, path_description.emplace_back(target.location, target.name_id, segment_duration, 0.f,
target.name_id,
segment_duration,
0.f,
is_via_location ? TurnInstruction::ReachViaLocation is_via_location ? TurnInstruction::ReachViaLocation
: TurnInstruction::NoTurn, : TurnInstruction::NoTurn,
true, true, true, travel_mode);
true,
travel_mode);
BOOST_ASSERT(path_description.back().duration == segment_duration); BOOST_ASSERT(path_description.back().duration == segment_duration);
} }
@ -98,12 +92,8 @@ void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
return path_point.turn_instruction; return path_point.turn_instruction;
}(); }();
path_description.emplace_back(coordinate, path_description.emplace_back(coordinate, path_point.name_id, path_point.segment_duration, 0.f,
path_point.name_id, turn, path_point.travel_mode);
path_point.segment_duration,
0.f,
turn,
path_point.travel_mode);
} }
JSON::Value DescriptionFactory::AppendGeometryString(const bool return_encoded) JSON::Value DescriptionFactory::AppendGeometryString(const bool return_encoded)
@ -205,7 +195,7 @@ void DescriptionFactory::Run(const unsigned zoom_level)
// Post-processing to remove empty or nearly empty path segments // Post-processing to remove empty or nearly empty path segments
if (path_description.size() > 2 && if (path_description.size() > 2 &&
std::numeric_limits<double>::epsilon() > path_description.back().length) std::numeric_limits<float>::epsilon() > path_description.back().length)
{ {
path_description.pop_back(); path_description.pop_back();
path_description.back().necessary = true; path_description.back().necessary = true;
@ -214,7 +204,7 @@ void DescriptionFactory::Run(const unsigned zoom_level)
} }
if (path_description.size() > 2 && if (path_description.size() > 2 &&
std::numeric_limits<double>::epsilon() > path_description.front().length) std::numeric_limits<float>::epsilon() > path_description.front().length)
{ {
path_description.erase(path_description.begin()); path_description.erase(path_description.begin());
path_description.front().turn_instruction = TurnInstruction::HeadOn; path_description.front().turn_instruction = TurnInstruction::HeadOn;