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

rename contra_flow to travel_mode, use unsigned char

Browse Source
This commit is contained in:
Emil Tin
2014-08-09 11:23:41 +02:00
parent 82c2ae5441
commit 3e6f27d173
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataStructures/ImportEdge.cpp
+2 -2
View File
@@ -56,11 +56,11 @@ NodeBasedEdge::NodeBasedEdge(NodeID source,
bool roundabout,
bool in_tiny_cc,
bool access_restricted,
bool contra_flow,
TravelMode travel_mode,
bool is_split)
: source(source), target(target), name_id(name_id), weight(weight), type(type),
forward(forward), backward(backward), roundabout(roundabout), in_tiny_cc(in_tiny_cc),
access_restricted(access_restricted), contra_flow(contra_flow), is_split(is_split)
access_restricted(access_restricted), travel_mode(travel_mode), is_split(is_split)
{
BOOST_ASSERT_MSG(type > 0, "negative edge type");
}
DataStructures/ImportEdge.h
+2 -2
View File
@@ -44,7 +44,7 @@ struct NodeBasedEdge
bool roundabout,
bool in_tiny_cc,
bool access_restricted,
bool contra_flow,
TravelMode travel_mode,
bool is_split);
NodeID source;
@@ -57,7 +57,7 @@ struct NodeBasedEdge
bool roundabout : 1;
bool in_tiny_cc : 1;
bool access_restricted : 1;
bool contra_flow : 1;
TravelMode travel_mode : 1;
bool is_split : 1;
NodeBasedEdge() = delete;
DataStructures/NodeBasedGraph.h
+4 -4
View File
@@ -15,7 +15,7 @@ struct NodeBasedEdgeData
: distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID),
nameID(std::numeric_limits<unsigned>::max()), type(std::numeric_limits<short>::max()),
isAccessRestricted(false), shortcut(false), forward(false), backward(false),
roundabout(false), ignore_in_grid(false), contraFlow(false)
roundabout(false), ignore_in_grid(false), travel_mode(false)
{
}
@@ -29,7 +29,7 @@ struct NodeBasedEdgeData
bool backward : 1;
bool roundabout : 1;
bool ignore_in_grid : 1;
bool contraFlow : 1;
TravelMode travel_mode : 1;
void SwapDirectionFlags()
{
@@ -42,7 +42,7 @@ struct NodeBasedEdgeData
{
return (forward == other.forward) && (backward == other.backward) &&
(nameID == other.nameID) && (ignore_in_grid == other.ignore_in_grid) &&
(contraFlow == other.contraFlow);
(travel_mode == other.travel_mode);
}
};
@@ -93,7 +93,7 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge
edge.data.nameID = import_edge.name_id;
edge.data.type = import_edge.type;
edge.data.isAccessRestricted = import_edge.access_restricted;
edge.data.contraFlow = import_edge.contra_flow;
edge.data.travel_mode = import_edge.travel_mode;
edges_list.push_back(edge);
if (!import_edge.is_split)