From 510cc22484cf2f83220893a022b2a403c39c1cf7 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 12 Nov 2013 18:23:09 -0500 Subject: [PATCH] Refactor name of legacy class _Node into more telling name ExternalMemoryNode --- DataStructures/ImportNode.h | 32 ++++++++++++++++++++++-------- Extractor/ExtractionContainers.cpp | 2 +- Extractor/ExtractionContainers.h | 2 +- Extractor/ExtractorCallbacks.cpp | 2 +- Extractor/ExtractorCallbacks.h | 2 +- Extractor/ExtractorStructs.h | 13 +++++++----- Util/GraphLoader.h | 4 ++-- 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/DataStructures/ImportNode.h b/DataStructures/ImportNode.h index 70167be4c..f249a6433 100644 --- a/DataStructures/ImportNode.h +++ b/DataStructures/ImportNode.h @@ -32,15 +32,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/HashTable.h" -struct _Node : NodeInfo{ - _Node(int _lat, int _lon, unsigned int _id, bool _bollard, bool _trafficLight) : NodeInfo(_lat, _lon, _id), bollard(_bollard), trafficLight(_trafficLight) {} - _Node() : bollard(false), trafficLight(false) {} +struct ExternalMemoryNode : NodeInfo { + ExternalMemoryNode( + int lat, + int lon, + unsigned int id, + bool bollard, + bool traffic_light + ) : + NodeInfo(lat, lon, id), + bollard(bollard), + trafficLight(traffic_light) + { } + ExternalMemoryNode() : bollard(false), trafficLight(false) {} - static _Node min_value() { - return _Node(0,0,0, false, false); + static ExternalMemoryNode min_value() { + return ExternalMemoryNode(0,0,0, false, false); } - static _Node max_value() { - return _Node((std::numeric_limits::max)(), (std::numeric_limits::max)(), (std::numeric_limits::max)(), false, false); + static ExternalMemoryNode max_value() { + return ExternalMemoryNode( + std::numeric_limits::max(), + std::numeric_limits::max(), + std::numeric_limits::max(), + false, + false + ); } NodeID key() const { return id; @@ -49,7 +65,7 @@ struct _Node : NodeInfo{ bool trafficLight; }; -struct ImportNode : public _Node { +struct ImportNode : public ExternalMemoryNode { HashTable keyVals; inline void Clear() { diff --git a/Extractor/ExtractionContainers.cpp b/Extractor/ExtractionContainers.cpp index d319567fb..9460b1ffa 100644 --- a/Extractor/ExtractionContainers.cpp +++ b/Extractor/ExtractionContainers.cpp @@ -165,7 +165,7 @@ void ExtractionContainers::PrepareData(const std::string & output_file_name, con continue; } if(*usedNodeIDsIT == nodesIT->id) { - fout.write((char*)&(*nodesIT), sizeof(_Node)); + fout.write((char*)&(*nodesIT), sizeof(ExternalMemoryNode)); ++usedNodeCounter; ++usedNodeIDsIT; ++nodesIT; diff --git a/Extractor/ExtractionContainers.h b/Extractor/ExtractionContainers.h index 14d7ffdbb..56fdcedff 100644 --- a/Extractor/ExtractionContainers.h +++ b/Extractor/ExtractionContainers.h @@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class ExtractionContainers { public: typedef stxxl::vector STXXLNodeIDVector; - typedef stxxl::vector<_Node> STXXLNodeVector; + typedef stxxl::vector STXXLNodeVector; typedef stxxl::vector STXXLEdgeVector; typedef stxxl::vector STXXLStringVector; typedef stxxl::vector<_RawRestrictionContainer> STXXLRestrictionsVector; diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index c61f408ae..d9750092e 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -36,7 +36,7 @@ ExtractorCallbacks::ExtractorCallbacks(ExtractionContainers * ext, StringMap * s ExtractorCallbacks::~ExtractorCallbacks() { } /** warning: caller needs to take care of synchronization! */ -void ExtractorCallbacks::nodeFunction(const _Node &n) { +void ExtractorCallbacks::nodeFunction(const ExternalMemoryNode &n) { if(n.lat <= 85*COORDINATE_PRECISION && n.lat >= -85*COORDINATE_PRECISION) { externalMemory->allNodes.push_back(n); } diff --git a/Extractor/ExtractorCallbacks.h b/Extractor/ExtractorCallbacks.h index 6b0c434be..91b22d4ff 100644 --- a/Extractor/ExtractorCallbacks.h +++ b/Extractor/ExtractorCallbacks.h @@ -55,7 +55,7 @@ public: ~ExtractorCallbacks(); /** warning: caller needs to take care of synchronization! */ - void nodeFunction(const _Node &n); + void nodeFunction(const ExternalMemoryNode &n); bool restrictionFunction(const _RawRestrictionContainer &r); diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h index 73a4df628..144bf7f71 100644 --- a/Extractor/ExtractorStructs.h +++ b/Extractor/ExtractorStructs.h @@ -172,16 +172,19 @@ struct Cmp : public std::binary_function { } }; -struct CmpNodeByID : public std::binary_function<_Node, _Node, bool> { - typedef _Node value_type; - bool operator () (const _Node & a, const _Node & b) const { +struct CmpNodeByID : public std::binary_function { + typedef ExternalMemoryNode value_type; + bool operator () ( + const ExternalMemoryNode & a, + const ExternalMemoryNode & b + ) const { return a.id < b.id; } value_type max_value() { - return _Node::max_value(); + return ExternalMemoryNode::max_value(); } value_type min_value() { - return _Node::min_value(); + return ExternalMemoryNode::min_value(); } }; diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index 4a4d3f61c..46450b3e5 100644 --- a/Util/GraphLoader.h +++ b/Util/GraphLoader.h @@ -84,9 +84,9 @@ NodeID readBinaryOSRMGraphFromStream( ExternalNodeMap ext_to_int_id_map; in.read((char*)&n, sizeof(NodeID)); SimpleLogger().Write() << "Importing n = " << n << " nodes "; - _Node node; + ExternalMemoryNode node; for (NodeID i=0; ipush_back(NodeInfo(node.lat, node.lon, node.id)); ext_to_int_id_map.emplace(node.id, i); if(node.bollard) {