From 34b67d0621e2772ebf525238e05bdb36d2b97c78 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 25 Aug 2010 14:12:17 +0000 Subject: [PATCH] Minor code tweaks --- extractLargeNetwork.cpp | 8 ++++---- typedefs.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extractLargeNetwork.cpp b/extractLargeNetwork.cpp index 75bcacc10..75f1c0292 100644 --- a/extractLargeNetwork.cpp +++ b/extractLargeNetwork.cpp @@ -52,6 +52,7 @@ STXXLNodeVector allNodes; STXXLNodeVector confirmedNodes; STXXLEdgeVector allEdges; STXXLEdgeVector confirmedEdges; + NodeMap * nodeMap = new NodeMap(); int main (int argc, char *argv[]) @@ -244,6 +245,7 @@ int main (int argc, char *argv[]) eit->speed = settings.speedProfile.speed[eit->type]; double weight = ( distance * 10. ) / (eit->speed / 3.6); double intWeight = max(1, (int) weight); + switch(eit->direction) { case _Way::notSure: @@ -265,7 +267,6 @@ int main (int argc, char *argv[]) } fout.close(); cout << "ok, after " << get_timestamp() - time << "s" << endl; - time = get_timestamp(); } catch ( const std::exception& e ) { cerr << "Caught Execption:" << e.what() << endl; return false; @@ -282,8 +283,7 @@ int main (int argc, char *argv[]) confirmedNodes.clear(); allEdges.clear(); confirmedEdges.clear(); - - // xmlFreeTextReader(inputReader); + xmlFreeTextReader(inputReader); + delete nodeMap; return 0; } - diff --git a/typedefs.h b/typedefs.h index 6950364b3..1ae4c6498 100644 --- a/typedefs.h +++ b/typedefs.h @@ -21,6 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt. #ifndef TYPEDEFS_H_ #define TYPEDEFS_H_ +#include + using namespace std; #define VERBOSE(x) x