Merge branch 'master' of bitbucket.org:cosmicvoids/void_identification

This commit is contained in:
P.M. Sutter 2013-04-23 07:40:37 -05:00
commit b1252d8403

View file

@ -134,11 +134,15 @@ bool loadZobov(const char *descName, const char *adjName, const char *voidsName,
}
cout << "Loading description" << endl;
int lineid = 1;
string line;
getline(descFile, line);
lineid++;
getline(descFile, line);
lineid++;
getline(descFile, line);
lineid++;
while (!descFile.eof())
{
istringstream lineStream(line.c_str());
@ -160,7 +164,7 @@ bool loadZobov(const char *descName, const char *adjName, const char *voidsName,
>> probability;
if (!lineStream)
{
cerr << "Error in text stream" << endl;
cerr << "Error in text stream at line " << lineid << endl;
abort();
}
@ -187,6 +191,7 @@ bool loadZobov(const char *descName, const char *adjName, const char *voidsName,
<< actualNumber << ")" << endl;
}
getline(descFile, line);
lineid++;
}
cout << "Done loading" << endl;