Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Missing initialization of stxxl-vector

Browse Source
This commit is contained in:
DennisOSRM 2011-11-15 11:08:44 +01:00
parent 8f3de7d022
commit 1e54b3e69a
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DataStructures/NNGrid.h
View File

@ -164,6 +164,7 @@ public:
iif = std::string(_i); iif = std::string(_i);
ramIndexTable.resize((1024*1024), UINT_MAX); ramIndexTable.resize((1024*1024), UINT_MAX);
ramInFile.open(rif, std::ios::in | std::ios::binary); ramInFile.open(rif, std::ios::in | std::ios::binary);
entries = NULL;
} }
~NNGrid() { ~NNGrid() {
@ -287,7 +288,6 @@ public:
} }
bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode) { bool FindPhantomNodeForCoordinate( const _Coordinate & location, PhantomNode & resultNode) {
INFO("FindPhantomNodeForCoordinate");
bool foundNode = false; bool foundNode = false;
_Coordinate startCoord(100000*(lat2y(static_cast<double>(location.lat)/100000.)), location.lon); _Coordinate startCoord(100000*(lat2y(static_cast<double>(location.lat)/100000.)), location.lon);
/** search for point on edge close to source */ /** search for point on edge close to source */
@ -413,11 +413,9 @@ private:
std::vector<GridEntry> entriesWithSameFileIndex; std::vector<GridEntry> entriesWithSameFileIndex;
unsigned fileIndex = entriesWithSameRAMIndex.begin()->fileIndex; unsigned fileIndex = entriesWithSameRAMIndex.begin()->fileIndex;
for(std::vector<GridEntry>::iterator it = entriesWithSameRAMIndex.begin(); it != uniqueEnd; it++) for(std::vector<GridEntry>::iterator it = entriesWithSameRAMIndex.begin(); it != uniqueEnd; it++) {
{
assert(cellMap->find(it->fileIndex) != cellMap->end() ); //asserting that file index belongs to cell index assert(cellMap->find(it->fileIndex) != cellMap->end() ); //asserting that file index belongs to cell index
if(it->fileIndex != fileIndex) if(it->fileIndex != fileIndex) {
{
// start in cellIndex vermerken // start in cellIndex vermerken
int localFileIndex = entriesWithSameFileIndex.begin()->fileIndex; int localFileIndex = entriesWithSameFileIndex.begin()->fileIndex;
int localCellIndex = cellMap->find(localFileIndex)->second; int localCellIndex = cellMap->find(localFileIndex)->second;
@ -426,7 +424,6 @@ private:
cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset; cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset;
indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer); indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer);
entriesWithSameFileIndex.clear(); //todo: in flushEntries erledigen.
} }
GridEntry data = *it; GridEntry data = *it;
entriesWithSameFileIndex.push_back(data); entriesWithSameFileIndex.push_back(data);
@ -439,19 +436,16 @@ private:
cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset; cellIndex[localCellIndex] = indexIntoTmpBuffer + fileOffset;
indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer); indexIntoTmpBuffer += FlushEntriesWithSameFileIndexToBuffer(entriesWithSameFileIndex, tmpBuffer, indexIntoTmpBuffer);
entriesWithSameFileIndex.clear(); //todo: in flushEntries erledigen.
assert(entriesWithSameFileIndex.size() == 0); assert(entriesWithSameFileIndex.size() == 0);
for(int i = 0; i < 32*32; i++) for(int i = 0; i < 32*32; i++) {
{
indexOutFile.write((char *)&cellIndex[i], sizeof(unsigned)); indexOutFile.write((char *)&cellIndex[i], sizeof(unsigned));
numberOfWrittenBytes += sizeof(unsigned); numberOfWrittenBytes += sizeof(unsigned);
} }
//write contents of tmpbuffer to disk //write contents of tmpbuffer to disk
for(unsigned i = 0; i < indexIntoTmpBuffer; i++) for(unsigned i = 0; i < indexIntoTmpBuffer; i++) {
{
indexOutFile.write(&(tmpBuffer->at(i)), sizeof(char)); indexOutFile.write(&(tmpBuffer->at(i)), sizeof(char));
numberOfWrittenBytes += sizeof(char); numberOfWrittenBytes += sizeof(char);
} }
@ -461,14 +455,12 @@ private:
return numberOfWrittenBytes; return numberOfWrittenBytes;
} }
unsigned FlushEntriesWithSameFileIndexToBuffer( std::vector<GridEntry> &vectorWithSameFileIndex, vector<char> * tmpBuffer, const unsigned index) unsigned FlushEntriesWithSameFileIndexToBuffer( std::vector<GridEntry> &vectorWithSameFileIndex, vector<char> * tmpBuffer, const unsigned index) {
{
tmpBuffer->resize(tmpBuffer->size()+(sizeof(_GridEdge)*vectorWithSameFileIndex.size()) ); tmpBuffer->resize(tmpBuffer->size()+(sizeof(_GridEdge)*vectorWithSameFileIndex.size()) );
unsigned counter = 0; unsigned counter = 0;
unsigned max = UINT_MAX; unsigned max = UINT_MAX;
for(unsigned i = 0; i < vectorWithSameFileIndex.size()-1; i++) for(unsigned i = 0; i < vectorWithSameFileIndex.size()-1; i++) {
{
assert( vectorWithSameFileIndex[i].fileIndex == vectorWithSameFileIndex[i+1].fileIndex ); assert( vectorWithSameFileIndex[i].fileIndex == vectorWithSameFileIndex[i+1].fileIndex );
assert( vectorWithSameFileIndex[i].ramIndex == vectorWithSameFileIndex[i+1].ramIndex ); assert( vectorWithSameFileIndex[i].ramIndex == vectorWithSameFileIndex[i+1].ramIndex );
} }
@ -483,11 +475,11 @@ private:
} }
} }
char * umax = (char *) &max; char * umax = (char *) &max;
for(unsigned i = 0; i < sizeof(unsigned); i++) for(unsigned i = 0; i < sizeof(unsigned); i++) {
{
tmpBuffer->at(index+counter) = umax[i]; tmpBuffer->at(index+counter) = umax[i];
counter++; counter++;
} }
vectorWithSameFileIndex.clear();
return counter; return counter;
} }