diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2fca602..7f238c834 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,14 +357,11 @@ if(BUILD_TOOLS) if(UNIX AND NOT APPLE) target_link_libraries(osrm-unlock-all rt) endif() - add_executable(osrm-check-hsgr src/tools/check-hsgr.cpp $) - target_link_libraries(osrm-check-hsgr ${Boost_LIBRARIES} ${TBB_LIBRARIES}) add_executable(osrm-springclean src/tools/springclean.cpp $) target_link_libraries(osrm-springclean ${Boost_LIBRARIES}) install(TARGETS osrm-io-benchmark DESTINATION bin) install(TARGETS osrm-unlock-all DESTINATION bin) - install(TARGETS osrm-check-hsgr DESTINATION bin) install(TARGETS osrm-springclean DESTINATION bin) endif() diff --git a/src/tools/check-hsgr.cpp b/src/tools/check-hsgr.cpp deleted file mode 100644 index 54822b1df..000000000 --- a/src/tools/check-hsgr.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "util/percent.hpp" -#include "contractor/query_edge.hpp" -#include "util/static_graph.hpp" -#include "util/integer_range.hpp" -#include "util/graph_loader.hpp" -#include "util/simple_logger.hpp" -#include "util/osrm_exception.hpp" - -#include -#include - -#include -#include -#include - -namespace osrm -{ -namespace tools -{ - -using EdgeData = contractor::QueryEdge::EdgeData; -using QueryGraph = util::StaticGraph; -} -} - -int main(int argc, char *argv[]) try -{ - osrm::util::LogPolicy::GetInstance().Unmute(); - if (argc != 2) - { - osrm::util::SimpleLogger().Write(logWARNING) << "usage: " << argv[0] << " "; - return EXIT_FAILURE; - } - - boost::filesystem::path hsgr_path(argv[1]); - - std::vector node_list; - std::vector edge_list; - osrm::util::SimpleLogger().Write() << "loading graph from " << hsgr_path.string(); - - unsigned m_check_sum = 0; - unsigned m_number_of_nodes = - readHSGRFromStream(hsgr_path, node_list, edge_list, &m_check_sum); - osrm::util::SimpleLogger().Write() << "expecting " << m_number_of_nodes - << " nodes, checksum: " << m_check_sum; - BOOST_ASSERT_MSG(0 != node_list.size(), "node list empty"); - osrm::util::SimpleLogger().Write() << "loaded " << node_list.size() << " nodes and " - << edge_list.size() << " edges"; - auto m_query_graph = std::make_shared(node_list, edge_list); - - BOOST_ASSERT_MSG(0 == node_list.size(), "node list not flushed"); - BOOST_ASSERT_MSG(0 == edge_list.size(), "edge list not flushed"); - - osrm::util::Percent progress(m_query_graph->GetNumberOfNodes()); - for (const auto node_u : osrm::util::irange(0u, m_query_graph->GetNumberOfNodes())) - { - for (const auto eid : m_query_graph->GetAdjacentEdgeRange(node_u)) - { - const osrm::tools::EdgeData &data = m_query_graph->GetEdgeData(eid); - if (!data.shortcut) - { - continue; - } - const unsigned node_v = m_query_graph->GetTarget(eid); - const EdgeID edge_id_1 = m_query_graph->FindEdgeInEitherDirection(node_u, data.id); - if (SPECIAL_EDGEID == edge_id_1) - { - throw osrm::util::exception( - "cannot find first segment of edge (" + std::to_string(node_u) + "," + - std::to_string(data.id) + "," + std::to_string(node_v) + "), eid: " + - std::to_string(eid)); - } - const EdgeID edge_id_2 = m_query_graph->FindEdgeInEitherDirection(data.id, node_v); - if (SPECIAL_EDGEID == edge_id_2) - { - throw osrm::util::exception( - "cannot find second segment of edge (" + std::to_string(node_u) + "," + - std::to_string(data.id) + "," + std::to_string(node_v) + "), eid: " + - std::to_string(eid)); - } - } - progress.printStatus(node_u); - } - m_query_graph.reset(); - osrm::util::SimpleLogger().Write() << "Data file " << argv[0] << " appears to be OK"; - - return EXIT_SUCCESS; -} -catch (const std::exception &e) -{ - osrm::util::SimpleLogger().Write(logWARNING) << "[exception] " << e.what(); - return EXIT_FAILURE; -}