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

Minor code tweaks

Browse Source
This commit is contained in:
Dennis Luxen 2010-08-25 14:12:17 +00:00
parent b3fded0725
commit 34b67d0621
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extractLargeNetwork.cpp
View File

@ -52,6 +52,7 @@ STXXLNodeVector allNodes;
STXXLNodeVector confirmedNodes; STXXLNodeVector confirmedNodes;
STXXLEdgeVector allEdges; STXXLEdgeVector allEdges;
STXXLEdgeVector confirmedEdges; STXXLEdgeVector confirmedEdges;
NodeMap * nodeMap = new NodeMap(); NodeMap * nodeMap = new NodeMap();
int main (int argc, char *argv[]) int main (int argc, char *argv[])
@ -244,6 +245,7 @@ int main (int argc, char *argv[])
eit->speed = settings.speedProfile.speed[eit->type]; eit->speed = settings.speedProfile.speed[eit->type];
double weight = ( distance * 10. ) / (eit->speed / 3.6); double weight = ( distance * 10. ) / (eit->speed / 3.6);
double intWeight = max(1, (int) weight); double intWeight = max(1, (int) weight);
switch(eit->direction) switch(eit->direction)
{ {
case _Way::notSure: case _Way::notSure:
@ -265,7 +267,6 @@ int main (int argc, char *argv[])
} }
fout.close(); fout.close();
cout << "ok, after " << get_timestamp() - time << "s" << endl; cout << "ok, after " << get_timestamp() - time << "s" << endl;
time = get_timestamp();
} catch ( const std::exception& e ) { } catch ( const std::exception& e ) {
cerr << "Caught Execption:" << e.what() << endl; cerr << "Caught Execption:" << e.what() << endl;
return false; return false;
@ -282,8 +283,7 @@ int main (int argc, char *argv[])
confirmedNodes.clear(); confirmedNodes.clear();
allEdges.clear(); allEdges.clear();
confirmedEdges.clear(); confirmedEdges.clear();
xmlFreeTextReader(inputReader);
// xmlFreeTextReader(inputReader); delete nodeMap;
return 0; return 0;
} }

2
typedefs.h
View File

@ -21,6 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
#ifndef TYPEDEFS_H_ #ifndef TYPEDEFS_H_
#define TYPEDEFS_H_ #define TYPEDEFS_H_
#include <climits>
using namespace std; using namespace std;
#define VERBOSE(x) x #define VERBOSE(x) x