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

adapt tiny_components.hpp to have the same interface as bfs_components.hpp

Browse Source
This commit is contained in:
Dennis Luxen
2014-12-22 16:43:57 +01:00
parent ccc4607d6d
commit a5c824f694
3 changed files with 24 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/components.cpp
+11 -9
View File
@@ -52,7 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector>
std::vector<QueryNode> coordinate_list;
std::vector<TurnRestriction> restrictions_vector;
std::vector<TurnRestriction> restriction_list;
std::vector<NodeID> bollard_node_list;
std::vector<NodeID> traffic_lights_list;
@@ -107,12 +107,12 @@ int main(int argc, char *argv[])
}
uint32_t usable_restrictions = 0;
restriction_ifstream.read((char *)&usable_restrictions, sizeof(uint32_t));
restrictions_vector.resize(usable_restrictions);
restriction_list.resize(usable_restrictions);
// load restrictions
if (usable_restrictions > 0)
{
restriction_ifstream.read((char *)&(restrictions_vector[0]),
restriction_ifstream.read((char *)&(restriction_list[0]),
usable_restrictions * sizeof(TurnRestriction));
}
restriction_ifstream.close();
@@ -130,14 +130,14 @@ int main(int argc, char *argv[])
bollard_node_list,
traffic_lights_list,
&coordinate_list,
restrictions_vector);
restriction_list);
input_stream.close();
BOOST_ASSERT_MSG(restrictions_vector.size() == usable_restrictions,
"size of restrictions_vector changed");
BOOST_ASSERT_MSG(restriction_list.size() == usable_restrictions,
"size of restriction_list changed");
SimpleLogger().Write() << restrictions_vector.size() << " restrictions, "
SimpleLogger().Write() << restriction_list.size() << " restrictions, "
<< bollard_node_list.size() << " bollard nodes, "
<< traffic_lights_list.size() << " traffic lights";
@@ -179,9 +179,11 @@ int main(int argc, char *argv[])
edge_list.shrink_to_fit();
SimpleLogger().Write() << "Starting SCC graph traversal";
RestrictionMap restriction_map(restriction_list);
auto tarjan = osrm::make_unique<TarjanSCC<TarjanDynamicGraph>>(graph,
bollard_node_list,
restrictions_vector);
restriction_map,
bollard_node_list);
tarjan->Run();
// output