diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index 855a0d9ff..9ccb27b7d 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -237,7 +237,7 @@ public: bool flushedContractor = false; while ( numberOfContractedNodes < numberOfNodes ) { - if(!flushedContractor && (numberOfContractedNodes > (numberOfNodes*0.5) ) ){ + if(!flushedContractor && (numberOfContractedNodes > (numberOfNodes*0.75) ) ){ INFO("Flushing memory after " << numberOfContractedNodes << " nodes"); //Delete old heap data to free memory that we need for the coming operations @@ -302,7 +302,7 @@ public: temporaryEdgeStorage.seekp(initialFilePosition); temporaryEdgeStorage.write((char*)&numberOfTemporaryEdges, sizeof(unsigned)); temporaryEdgeStorage.close(); - INFO("Flushed " << numberOfTemporaryEdges << " to disk"); + INFO("Flushed " << numberOfTemporaryEdges << " edges to disk"); //Delete map from old NodeIDs to new ones. std::vector().swap(newNodeIDFromOldNodeIDMap); diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index b297040f7..a2d69e245 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -77,13 +77,15 @@ EdgeBasedGraphFactory::EdgeBasedGraphFactory(int nodes, std::vector edges; - edges.reserve( 2 * inputEdges.size() ); +// edges.reserve( 2 * inputEdges.size() ); for ( std::vector< NodeBasedEdge >::const_iterator i = inputEdges.begin(); i != inputEdges.end(); ++i ) { _NodeBasedEdge edge; @@ -191,7 +193,7 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode( void EdgeBasedGraphFactory::Run() { INFO("Generating edge based representation of input data"); - edgeBasedNodes.reserve(_nodeBasedGraph->GetNumberOfEdges()); +// edgeBasedNodes.reserve(_nodeBasedGraph->GetNumberOfEdges()); Percent p(_nodeBasedGraph->GetNumberOfNodes()); int numberOfSkippedTurns(0); int nodeBasedEdgeCounter(0);