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

Change EdgeBasedNodeDataExternalContainer to EdgeBasedNodeDataContainer

Browse Source
This commit is contained in:
Michael Krasnyk 2017-05-15 22:36:52 +02:00 committed by Patrick Niklaus
parent 26702920b4
commit 65de940882
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/extractor/edge_based_graph_factory.hpp
View File

@ -93,7 +93,7 @@ class EdgeBasedGraphFactory
// The following get access functions destroy the content in the factory // The following get access functions destroy the content in the factory
void GetEdgeBasedEdges(util::DeallocatingVector<EdgeBasedEdge> &edges); void GetEdgeBasedEdges(util::DeallocatingVector<EdgeBasedEdge> &edges);
void GetEdgeBasedNodes(EdgeBasedNodeDataExternalContainer &ebg_node_data_container); void GetEdgeBasedNodes(EdgeBasedNodeDataContainer &ebg_node_data_container);
void GetNodeBasedEdges(std::vector<EdgeBasedNode> &nodes); void GetNodeBasedEdges(std::vector<EdgeBasedNode> &nodes);
void GetStartPointMarkers(std::vector<bool> &node_is_startpoint); void GetStartPointMarkers(std::vector<bool> &node_is_startpoint);
void GetEdgeBasedNodeWeights(std::vector<EdgeWeight> &output_node_weights); void GetEdgeBasedNodeWeights(std::vector<EdgeWeight> &output_node_weights);
@ -130,7 +130,7 @@ class EdgeBasedGraphFactory
//! list of edge based nodes (compressed segments) //! list of edge based nodes (compressed segments)
std::vector<EdgeBasedNode> m_edge_based_node_list; std::vector<EdgeBasedNode> m_edge_based_node_list;
EdgeBasedNodeDataExternalContainer m_ebg_node_data_container; EdgeBasedNodeDataContainer m_ebg_node_data_container;
util::DeallocatingVector<EdgeBasedEdge> m_edge_based_edge_list; util::DeallocatingVector<EdgeBasedEdge> m_edge_based_edge_list;
EdgeID m_max_edge_id; EdgeID m_max_edge_id;

4
include/extractor/extractor.hpp
View File

@ -63,7 +63,7 @@ class Extractor
BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment, BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
std::vector<util::Coordinate> &coordinates, std::vector<util::Coordinate> &coordinates,
extractor::PackedOSMIDs &osm_node_ids, extractor::PackedOSMIDs &osm_node_ids,
EdgeBasedNodeDataExternalContainer &ebg_node_data_container, EdgeBasedNodeDataContainer &ebg_node_data_container,
std::vector<EdgeBasedNode> &node_based_edge_list, std::vector<EdgeBasedNode> &node_based_edge_list,
std::vector<bool> &node_is_startpoint, std::vector<bool> &node_is_startpoint,
std::vector<EdgeWeight> &edge_based_node_weights, std::vector<EdgeWeight> &edge_based_node_weights,
@ -74,7 +74,7 @@ class Extractor
const ProfileProperties &properties) const; const ProfileProperties &properties) const;
void FindComponents(unsigned max_edge_id, void FindComponents(unsigned max_edge_id,
const util::DeallocatingVector<EdgeBasedEdge> &edges, const util::DeallocatingVector<EdgeBasedEdge> &edges,
EdgeBasedNodeDataExternalContainer &nodes) const; EdgeBasedNodeDataContainer &nodes) const;
void BuildRTree(std::vector<EdgeBasedNode> node_based_edge_list, void BuildRTree(std::vector<EdgeBasedNode> node_based_edge_list,
std::vector<bool> node_is_startpoint, std::vector<bool> node_is_startpoint,
const std::vector<util::Coordinate> &coordinates); const std::vector<util::Coordinate> &coordinates);

5
src/extractor/edge_based_graph_factory.cpp
View File

@ -66,8 +66,7 @@ void EdgeBasedGraphFactory::GetEdgeBasedEdges(
swap(m_edge_based_edge_list, output_edge_list); swap(m_edge_based_edge_list, output_edge_list);
} }
void EdgeBasedGraphFactory::GetEdgeBasedNodes( void EdgeBasedGraphFactory::GetEdgeBasedNodes(EdgeBasedNodeDataContainer &ebg_node_data_container)
EdgeBasedNodeDataExternalContainer &ebg_node_data_container)
{ {
using std::swap; // Koenig swap using std::swap; // Koenig swap
swap(ebg_node_data_container, m_ebg_node_data_container); swap(ebg_node_data_container, m_ebg_node_data_container);
@ -258,7 +257,7 @@ std::vector<NBGToEBG> EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
std::vector<NBGToEBG> mapping; std::vector<NBGToEBG> mapping;
// Allocate memory for edge-based nodes // Allocate memory for edge-based nodes
m_ebg_node_data_container = EdgeBasedNodeDataExternalContainer(m_max_edge_id + 1); m_ebg_node_data_container = EdgeBasedNodeDataContainer(m_max_edge_id + 1);
util::Log() << "Generating edge expanded nodes ... "; util::Log() << "Generating edge expanded nodes ... ";
{ {

6
src/extractor/extractor.cpp
View File

@ -130,7 +130,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
TIMER_START(expansion); TIMER_START(expansion);
EdgeBasedNodeDataExternalContainer edge_based_nodes_container; EdgeBasedNodeDataContainer edge_based_nodes_container;
std::vector<EdgeBasedNode> node_based_edges_list; std::vector<EdgeBasedNode> node_based_edges_list;
util::DeallocatingVector<EdgeBasedEdge> edge_based_edge_list; util::DeallocatingVector<EdgeBasedEdge> edge_based_edge_list;
std::vector<bool> node_is_startpoint; std::vector<bool> node_is_startpoint;
@ -338,7 +338,7 @@ void Extractor::WriteProfileProperties(const std::string &output_path,
void Extractor::FindComponents(unsigned max_edge_id, void Extractor::FindComponents(unsigned max_edge_id,
const util::DeallocatingVector<EdgeBasedEdge> &input_edge_list, const util::DeallocatingVector<EdgeBasedEdge> &input_edge_list,
EdgeBasedNodeDataExternalContainer &input_nodes) const EdgeBasedNodeDataContainer &input_nodes) const
{ {
using InputEdge = util::static_graph_details::SortableEdgeWithData<void>; using InputEdge = util::static_graph_details::SortableEdgeWithData<void>;
using UncontractedGraph = util::StaticGraph<void>; using UncontractedGraph = util::StaticGraph<void>;
@ -421,7 +421,7 @@ std::pair<std::size_t, EdgeID>
Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment, Extractor::BuildEdgeExpandedGraph(ScriptingEnvironment &scripting_environment,
std::vector<util::Coordinate> &coordinates, std::vector<util::Coordinate> &coordinates,
extractor::PackedOSMIDs &osm_node_ids, extractor::PackedOSMIDs &osm_node_ids,
EdgeBasedNodeDataExternalContainer &ebg_node_data_container, EdgeBasedNodeDataContainer &ebg_node_data_container,
std::vector<EdgeBasedNode> &node_based_edges_list, std::vector<EdgeBasedNode> &node_based_edges_list,
std::vector<bool> &node_is_startpoint, std::vector<bool> &node_is_startpoint,
std::vector<EdgeWeight> &edge_based_node_weights, std::vector<EdgeWeight> &edge_based_node_weights,