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

fix warning: implicit conversion changes signedness: 'int' to 'unsigned int'

Browse Source
This commit is contained in:
Dennis Luxen 2015-02-10 11:09:51 +01:00
parent e0f8acf733
commit 5a1ff4b50d
1 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
data_structures/phantom_node.cpp
View File

@ -1,6 +1,6 @@
/* /*
Copyright (c) 2013, Project OSRM, Dennis Luxen, others Copyright (c) 2015, Project OSRM, Dennis Luxen, others
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -34,40 +34,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <limits> #include <limits>
PhantomNode::PhantomNode(NodeID forward_node_id, NodeID reverse_node_id, unsigned name_id, PhantomNode::PhantomNode(NodeID forward_node_id,
int forward_weight, int reverse_weight, int forward_offset, int reverse_offset, NodeID reverse_node_id,
unsigned packed_geometry_id, unsigned component_id, FixedPointCoordinate &location, unsigned name_id,
unsigned short fwd_segment_position, int forward_weight,
TravelMode forward_travel_mode, TravelMode backward_travel_mode) : int reverse_weight,
forward_node_id(forward_node_id), int forward_offset,
reverse_node_id(reverse_node_id), int reverse_offset,
name_id(name_id), unsigned packed_geometry_id,
forward_weight(forward_weight), unsigned component_id,
reverse_weight(reverse_weight), FixedPointCoordinate &location,
forward_offset(forward_offset), unsigned short fwd_segment_position,
reverse_offset(reverse_offset), TravelMode forward_travel_mode,
packed_geometry_id(packed_geometry_id), TravelMode backward_travel_mode)
component_id(component_id), : forward_node_id(forward_node_id), reverse_node_id(reverse_node_id), name_id(name_id),
location(location), forward_weight(forward_weight), reverse_weight(reverse_weight),
fwd_segment_position(fwd_segment_position), forward_offset(forward_offset), reverse_offset(reverse_offset),
forward_travel_mode(forward_travel_mode), packed_geometry_id(packed_geometry_id), component_id(component_id), location(location),
backward_travel_mode(backward_travel_mode) fwd_segment_position(fwd_segment_position), forward_travel_mode(forward_travel_mode),
{ } backward_travel_mode(backward_travel_mode)
{
}
PhantomNode::PhantomNode() : PhantomNode::PhantomNode()
forward_node_id(SPECIAL_NODEID), : forward_node_id(SPECIAL_NODEID), reverse_node_id(SPECIAL_NODEID),
reverse_node_id(SPECIAL_NODEID), name_id(std::numeric_limits<unsigned>::max()), forward_weight(INVALID_EDGE_WEIGHT),
name_id(std::numeric_limits<unsigned>::max()), reverse_weight(INVALID_EDGE_WEIGHT), forward_offset(0), reverse_offset(0),
forward_weight(INVALID_EDGE_WEIGHT), packed_geometry_id(SPECIAL_EDGEID), component_id(std::numeric_limits<unsigned>::max()),
reverse_weight(INVALID_EDGE_WEIGHT), fwd_segment_position(0), forward_travel_mode(TRAVEL_MODE_INACCESSIBLE),
forward_offset(0), backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
reverse_offset(0), {
packed_geometry_id(SPECIAL_EDGEID), }
component_id(-1),
fwd_segment_position(0),
forward_travel_mode(TRAVEL_MODE_INACCESSIBLE),
backward_travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ }
int PhantomNode::GetForwardWeightPlusOffset() const int PhantomNode::GetForwardWeightPlusOffset() const
{ {
@ -89,43 +86,21 @@ int PhantomNode::GetReverseWeightPlusOffset() const
bool PhantomNode::is_bidirected() const bool PhantomNode::is_bidirected() const
{ {
return (forward_node_id != SPECIAL_NODEID) && return (forward_node_id != SPECIAL_NODEID) && (reverse_node_id != SPECIAL_NODEID);
(reverse_node_id != SPECIAL_NODEID);
} }
bool PhantomNode::is_compressed() const bool PhantomNode::is_compressed() const { return (forward_offset != 0) || (reverse_offset != 0); }
{
return (forward_offset != 0) || (reverse_offset != 0);
}
bool PhantomNode::is_valid(const unsigned number_of_nodes) const bool PhantomNode::is_valid(const unsigned number_of_nodes) const
{
return
location.is_valid() &&
(
(forward_node_id < number_of_nodes) ||
(reverse_node_id < number_of_nodes)
) &&
(
(forward_weight != INVALID_EDGE_WEIGHT) ||
(reverse_weight != INVALID_EDGE_WEIGHT)
) &&
(name_id != INVALID_NAMEID
);
}
bool PhantomNode::is_in_tiny_component() const
{
return component_id != 0;
}
bool PhantomNode::is_valid() const
{ {
return location.is_valid() && return location.is_valid() &&
((forward_node_id < number_of_nodes) || (reverse_node_id < number_of_nodes)) &&
((forward_weight != INVALID_EDGE_WEIGHT) || (reverse_weight != INVALID_EDGE_WEIGHT)) &&
(name_id != INVALID_NAMEID); (name_id != INVALID_NAMEID);
} }
bool PhantomNode::operator==(const PhantomNode & other) const bool PhantomNode::is_in_tiny_component() const { return component_id != 0; }
{
return location == other.location; bool PhantomNode::is_valid() const { return location.is_valid() && (name_id != INVALID_NAMEID); }
}
bool PhantomNode::operator==(const PhantomNode &other) const { return location == other.location; }