From d7bd78d612d40af5bf392c7f2c085025a0a91f3d Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 13 Aug 2013 18:21:14 +0200 Subject: [PATCH] correct timing of durations --- createHierarchy.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/createHierarchy.cpp b/createHierarchy.cpp index 9d46d74e9..daa6138de 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -237,9 +237,10 @@ int main (int argc, char *argv[]) { Contractor* contractor = new Contractor( edgeBasedNodeNumber, edgeBasedEdgeList ); double contractionStartedTimestamp(get_timestamp()); contractor->Run(); + const double contraction_duration = (get_timestamp() - contractionStartedTimestamp); SimpleLogger().Write() << "Contraction took " << - (get_timestamp() - contractionStartedTimestamp) << + contraction_duration << " sec"; DeallocatingVector< QueryEdge > contractedEdgeList; @@ -317,14 +318,15 @@ int main (int argc, char *argv[]) { ++usedEdgeCounter; } } - double endTime = (get_timestamp() - startupTime); + SimpleLogger().Write() << "Preprocessing : " << + (get_timestamp() - startupTime) << " seconds"; SimpleLogger().Write() << "Expansion : " << (nodeBasedNodeNumber/expansionHasFinishedTime) << " nodes/sec and " << (edgeBasedNodeNumber/expansionHasFinishedTime) << " edges/sec"; SimpleLogger().Write() << "Contraction: " << - (edgeBasedNodeNumber/expansionHasFinishedTime) << " nodes/sec and " << - usedEdgeCounter/endTime << " edges/sec"; + (edgeBasedNodeNumber/contraction_duration) << " nodes/sec and " << + usedEdgeCounter/contraction_duration << " edges/sec"; hsgr_output_stream.close(); //cleanedEdgeList.clear(); @@ -333,7 +335,6 @@ int main (int argc, char *argv[]) { } catch ( const std::exception &e ) { SimpleLogger().Write(logWARNING) << "Exception occured: " << e.what() << std::endl; - return -1; } return 0;