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

rename variables in ExternalMemoryNode to be more telling and consistent

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-29 12:28:10 +02:00
parent 4f666e4d53
commit b4b753ce2e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataStructures/ExternalMemoryNode.cpp
View File

@ -30,12 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <limits>
ExternalMemoryNode::ExternalMemoryNode(
int lat, int lon, unsigned int node_id, bool bollard, bool traffic_light)
: NodeInfo(lat, lon, node_id), bollard(bollard), trafficLight(traffic_light)
int lat, int lon, unsigned int node_id, bool barrier, bool traffic_lights)
: NodeInfo(lat, lon, node_id), barrier(barrier), traffic_lights(traffic_lights)
{
}
ExternalMemoryNode::ExternalMemoryNode() : bollard(false), trafficLight(false) {}
ExternalMemoryNode::ExternalMemoryNode() : barrier(false), traffic_lights(false) {}
ExternalMemoryNode ExternalMemoryNode::min_value()
{

6
DataStructures/ExternalMemoryNode.h
View File

@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct ExternalMemoryNode : NodeInfo
{
ExternalMemoryNode(int lat, int lon, NodeID id, bool bollard, bool traffic_light);
ExternalMemoryNode(int lat, int lon, NodeID id, bool barrier, bool traffic_light);
ExternalMemoryNode();
@ -42,8 +42,8 @@ struct ExternalMemoryNode : NodeInfo
static ExternalMemoryNode max_value();
bool bollard;
bool trafficLight;
bool barrier;
bool traffic_lights;
};
struct ExternalMemoryNodeSTXXLCompare

4
Util/GraphLoader.h
View File

@ -82,11 +82,11 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
input_stream.read((char *)&current_node, sizeof(ExternalMemoryNode));
int_to_ext_node_id_map->emplace_back(current_node.lat, current_node.lon, current_node.node_id);
ext_to_int_id_map.emplace(current_node.node_id, i);
if (current_node.bollard)
if (current_node.barrier)
{
barrier_node_list.emplace_back(i);
}
if (current_node.trafficLight)
if (current_node.traffic_lights)
{
traffic_light_node_list.emplace_back(i);
}