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

Don't mix signed and unsigned in comparisons as signed is converted first to unsigned.

Browse Source 
This is true:

    -1 > 1u

because the integer literal `-1` is first converted to a large unsigned
value and then compared to the unsigned `1`.

This patch fixes several of those isses in the farthest insertion
algorithm.

`-Wsign-compare` catches those issues.

References:

- http://stackoverflow.com/a/5416498
- C++14 standard
This commit is contained in:
Daniel J. Hofmann 2015-09-02 16:33:03 +02:00
parent bb1428eeb1
commit 980e4ee89a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
algorithms/trip_farthest_insertion.hpp
View File

@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../util/dist_table_wrapper.hpp" #include "../util/dist_table_wrapper.hpp"
#include <osrm/json_container.hpp> #include <osrm/json_container.hpp>
#include <boost/assert.hpp>
#include <cstdlib> #include <cstdlib>
#include <algorithm> #include <algorithm>
@ -170,10 +171,12 @@ std::vector<NodeID> FarthestInsertionTrip(const NodeIDIterator &start,
////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////
const auto component_size = std::distance(start, end); const auto component_size = std::distance(start, end);
BOOST_ASSERT(component_size >= 0);
auto max_from = -1; auto max_from = -1;
auto max_to = -1; auto max_to = -1;
if (component_size == number_of_locations) if (static_cast<std::size_t>(component_size) == number_of_locations)
{ {
// find the pair of location with the biggest distance and make the pair the initial start // find the pair of location with the biggest distance and make the pair the initial start
// trip // trip
@ -199,8 +202,10 @@ std::vector<NodeID> FarthestInsertionTrip(const NodeIDIterator &start,
} }
} }
} }
BOOST_ASSERT_MSG(max_from < number_of_locations && max_from >= 0, "start node"); BOOST_ASSERT(max_from >= 0);
BOOST_ASSERT_MSG(max_to < number_of_locations && max_to >= 0, "start node"); BOOST_ASSERT(max_to >= 0);
BOOST_ASSERT_MSG(static_cast<std::size_t>(max_from) < number_of_locations, "start node");
BOOST_ASSERT_MSG(static_cast<std::size_t>(max_to) < number_of_locations, "start node");
return FindRoute(number_of_locations, component_size, start, end, dist_table, max_from, max_to); return FindRoute(number_of_locations, component_size, start, end, dist_table, max_from, max_to);
} }