From 5265f38c359145731ed03b91755a91d708e029af Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 8 May 2014 23:22:49 +0200 Subject: [PATCH] Switched to std::shared_ptr in Contractor/ --- Contractor/Contractor.h | 8 +++----- Contractor/EdgeBasedGraphFactory.cpp | 3 +-- Contractor/EdgeBasedGraphFactory.h | 5 ++--- Contractor/TemporaryStorage.h | 8 +++----- DataStructures/NodeBasedGraph.h | 7 ++----- DataStructures/RestrictionMap.cpp | 2 +- DataStructures/RestrictionMap.h | 6 ++++-- prepare.cpp | 3 +-- 8 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index df8e6095e..46bf78be8 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -41,8 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include -#include #include #include @@ -234,7 +232,7 @@ class Contractor std::cout << "merged " << edges.size() - edge << " edges out of " << edges.size() << std::endl; edges.resize(edge); - _graph = boost::make_shared<_DynamicGraph>(nodes, edges); + _graph = std::make_shared<_DynamicGraph>(nodes, edges); edges.clear(); std::vector<_ContractorEdge>().swap(edges); BOOST_ASSERT(0 == edges.capacity()); @@ -396,7 +394,7 @@ class Contractor // create new graph std::sort(newSetOfEdges.begin(), newSetOfEdges.end()); - _graph = boost::make_shared<_DynamicGraph>(remainingNodes.size(), newSetOfEdges); + _graph = std::make_shared<_DynamicGraph>(remainingNodes.size(), newSetOfEdges); newSetOfEdges.clear(); flushedContractor = true; @@ -939,7 +937,7 @@ class Contractor return a < b; } - boost::shared_ptr<_DynamicGraph> _graph; + std::shared_ptr<_DynamicGraph> _graph; std::vector<_DynamicGraph::InputEdge> contractedEdges; unsigned edge_storage_slot; uint64_t temp_edge_counter; diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index c92efa651..7237c3e07 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -31,14 +31,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include #include #include EdgeBasedGraphFactory::EdgeBasedGraphFactory( - const boost::shared_ptr &node_based_graph, + const std::shared_ptr &node_based_graph, std::unique_ptr restriction_map, std::vector &barrier_node_list, std::vector &traffic_light_node_list, diff --git a/Contractor/EdgeBasedGraphFactory.h b/Contractor/EdgeBasedGraphFactory.h index 663735d5e..7fdb21e84 100644 --- a/Contractor/EdgeBasedGraphFactory.h +++ b/Contractor/EdgeBasedGraphFactory.h @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "GeometryCompressor.h" #include -#include #include #include @@ -63,7 +62,7 @@ class EdgeBasedGraphFactory : boost::noncopyable public: struct SpeedProfileProperties; - explicit EdgeBasedGraphFactory(const boost::shared_ptr &node_based_graph, + explicit EdgeBasedGraphFactory(const std::shared_ptr &node_based_graph, std::unique_ptr restricion_map, std::vector &barrier_node_list, std::vector &traffic_light_node_list, @@ -107,7 +106,7 @@ class EdgeBasedGraphFactory : boost::noncopyable std::vector m_edge_based_node_list; DeallocatingVector m_edge_based_edge_list; - boost::shared_ptr m_node_based_graph; + std::shared_ptr m_node_based_graph; boost::unordered_set m_barrier_nodes; boost::unordered_set m_traffic_lights; diff --git a/Contractor/TemporaryStorage.h b/Contractor/TemporaryStorage.h index ee80662ea..5864cc684 100644 --- a/Contractor/TemporaryStorage.h +++ b/Contractor/TemporaryStorage.h @@ -36,8 +36,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include -#include #include #include @@ -84,8 +82,8 @@ class TemporaryStorage { bool write_mode; boost::filesystem::path temp_path; - boost::shared_ptr temp_file; - boost::shared_ptr readWriteMutex; + std::shared_ptr temp_file; + std::shared_ptr readWriteMutex; std::vector buffer; StreamData() @@ -93,7 +91,7 @@ class TemporaryStorage TemporaryFilePattern.begin(), TemporaryFilePattern.end()))), temp_file(new boost::filesystem::fstream( temp_path, std::ios::in | std::ios::out | std::ios::trunc | std::ios::binary)), - readWriteMutex(boost::make_shared()) + readWriteMutex(std::make_shared()) { if (temp_file->fail()) { diff --git a/DataStructures/NodeBasedGraph.h b/DataStructures/NodeBasedGraph.h index f79e0363d..fcb65bc68 100644 --- a/DataStructures/NodeBasedGraph.h +++ b/DataStructures/NodeBasedGraph.h @@ -4,9 +4,6 @@ #include "DynamicGraph.h" #include "ImportEdge.h" -#include -#include - struct NodeBasedEdgeData { NodeBasedEdgeData() : distance(INVALID_EDGE_WEIGHT), edgeBasedNodeID(SPECIAL_NODEID), nameID(std::numeric_limits::max()), type(std::numeric_limits::max()), isAccessRestricted(false), shortcut(false), forward(false), backward(false), @@ -43,7 +40,7 @@ struct NodeBasedEdgeData { typedef DynamicGraph NodeBasedDynamicGraph; // Factory method to create NodeBasedDynamicGraph from ImportEdges -inline boost::shared_ptr NodeBasedDynamicGraphFromImportEdges( +inline std::shared_ptr NodeBasedDynamicGraphFromImportEdges( int number_of_nodes, std::vector& input_edge_list ) { @@ -92,7 +89,7 @@ inline boost::shared_ptr NodeBasedDynamicGraphFromImportE } std::sort( edges_list.begin(), edges_list.end() ); - auto graph = boost::make_shared( + auto graph = std::make_shared( number_of_nodes, edges_list ); diff --git a/DataStructures/RestrictionMap.cpp b/DataStructures/RestrictionMap.cpp index 166c3bb23..90c578677 100644 --- a/DataStructures/RestrictionMap.cpp +++ b/DataStructures/RestrictionMap.cpp @@ -1,7 +1,7 @@ #include "RestrictionMap.h" #include "NodeBasedGraph.h" -RestrictionMap::RestrictionMap(const boost::shared_ptr& graph, const std::vector & input_restrictions_list) +RestrictionMap::RestrictionMap(const std::shared_ptr& graph, const std::vector & input_restrictions_list) : m_count(0) , m_graph(graph) { diff --git a/DataStructures/RestrictionMap.h b/DataStructures/RestrictionMap.h index 59311e708..05a73ca70 100644 --- a/DataStructures/RestrictionMap.h +++ b/DataStructures/RestrictionMap.h @@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __RESTRICTION_MAP_H__ #define __RESTRICTION_MAP_H__ +#include + #include "../typedefs.h" #include "DynamicGraph.h" #include "Restriction.h" @@ -42,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class RestrictionMap { public: - RestrictionMap(const boost::shared_ptr& graph, + RestrictionMap(const std::shared_ptr& graph, const std::vector & input_restrictions_list); void FixupArrivingTurnRestriction(const NodeID u, const NodeID v, const NodeID w); @@ -59,7 +61,7 @@ private: typedef NodeBasedDynamicGraph::EdgeData EdgeData; unsigned m_count; - boost::shared_ptr m_graph; + std::shared_ptr m_graph; //! index -> list of (target, isOnly) std::vector m_restriction_bucket_list; //! maps (start, via) -> bucket index diff --git a/prepare.cpp b/prepare.cpp index 05d7c1980..1b664fdaa 100644 --- a/prepare.cpp +++ b/prepare.cpp @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include #include #include @@ -275,7 +274,7 @@ int main(int argc, char *argv[]) */ SimpleLogger().Write() << "Generating edge-expanded graph representation"; - boost::shared_ptr node_based_graph = NodeBasedDynamicGraphFromImportEdges(number_of_node_based_nodes, edge_list); + std::shared_ptr node_based_graph = NodeBasedDynamicGraphFromImportEdges(number_of_node_based_nodes, edge_list); std::unique_ptr restriction_map = std::unique_ptr(new RestrictionMap(node_based_graph, restriction_list)); EdgeBasedGraphFactory * edge_based_graph_factor = new EdgeBasedGraphFactory(node_based_graph,