From 80a94f57ad77fd8b02d1f496d6071d046f1b4109 Mon Sep 17 00:00:00 2001 From: Lev Dragunov Date: Fri, 19 Jun 2015 15:22:53 +0300 Subject: [PATCH] Routing generator cross section extended logging. --- generator/routing_generator.cpp | 1 + tools/unix/make_routing.sh | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp index 5827019b9b..6e8dedffd6 100644 --- a/generator/routing_generator.cpp +++ b/generator/routing_generator.cpp @@ -171,6 +171,7 @@ void CalculateCrossAdjacency(string const & mwmRoutingPath, routing::CrossRoutin for (auto i = out.first; i != out.second; ++i) targets.emplace_back(i->m_nodeId, false /* isStartNode */, mwmRoutingPath); + LOG(LINFO, ("Cross section has", sources.size(), "incomes and ", targets.size(), "outcomes.")); vector costs; FindWeightsMatrix(sources, targets, facade, costs); auto res = costs.begin(); diff --git a/tools/unix/make_routing.sh b/tools/unix/make_routing.sh index c89e6e551c..ec7a1518ab 100755 --- a/tools/unix/make_routing.sh +++ b/tools/unix/make_routing.sh @@ -9,10 +9,4 @@ then mkdir $TMPDIR fi -PV="cat" -if [ `which pv` ] -then - PV=pv -fi - -$PV ../../../omim-maps/$2.osm.bz2 | bzip2 -d | $GENERATOR_TOOL --make_routing --make_cross_section --osrm_file_name=../../../omim-maps/$2.osrm --output=$2 +$GENERATOR_TOOL --make_routing --make_cross_section --osrm_file_name=../../../omim-maps/$2.osrm --output=$2