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

Further cleanup

Browse Source
This commit is contained in:
DennisOSRM 2012-04-25 10:57:19 +02:00
parent f8761ecea0
commit 7e47553c88
6 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Algorithms/CRC32.cpp
View File

@ -83,9 +83,3 @@ unsigned CRC32::operator()(char *str, unsigned len){
crc =((*this).*(crcFunction))(str, len, crc); crc =((*this).*(crcFunction))(str, len, crc);
return crc; return crc;
} }
CRC32::~CRC32() {
// TODO Auto-generated destructor stub
}

2
Algorithms/CRC32.h
View File

@ -40,7 +40,7 @@ private:
public: public:
CRC32(); CRC32();
unsigned operator()(char *str, unsigned len); unsigned operator()(char *str, unsigned len);
virtual ~CRC32(); virtual ~CRC32() {};
}; };
#endif /* CRC32_H_ */ #endif /* CRC32_H_ */

1
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -255,7 +255,6 @@ void EdgeBasedGraphFactory::Run() {
//distance += ComputeTurnPenalty(u, v, w); //distance += ComputeTurnPenalty(u, v, w);
assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID); assert(edgeData1.edgeBasedNodeID != edgeData2.edgeBasedNodeID);
OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction); OriginalEdgeData oed(v,edgeData2.nameID, turnInstruction);
//TODO: replace v by pointer to oed-list
EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false ); EdgeBasedEdge newEdge(edgeData1.edgeBasedNodeID, edgeData2.edgeBasedNodeID, edgeBasedEdges.size(), distance, true, false );
originalEdgeData.push_back(oed); originalEdgeData.push_back(oed);
edgeBasedEdges.push_back(newEdge); edgeBasedEdges.push_back(newEdge);

10
DataStructures/ImportEdge.h
View File

@ -105,28 +105,22 @@ public:
EdgeBasedEdge() : EdgeBasedEdge() :
_source(0), _target(0), _edgeID(0)/*, _nameID1(0)*/, _weight(0), _forward(0), _backward(0)/*, _turnInstruction(0)*/ { assert(false); } //shall not be used. _source(0), _target(0), _edgeID(0)/*, _nameID1(0)*/, _weight(0), _forward(0), _backward(0)/*, _turnInstruction(0)*/ { assert(false); } //shall not be used.
explicit EdgeBasedEdge(NodeID s, NodeID t, NodeID v, /*unsigned n1,*/ EdgeWeight w, bool f, bool b/*, short ty*/) : explicit EdgeBasedEdge(NodeID s, NodeID t, NodeID v, EdgeWeight w, bool f, bool b) :
_source(s), _target(t), _edgeID(v), /*_nameID1(n1),*/ _weight(w), _forward(f), _backward(b)/*, _turnInstruction(ty)*/ { assert(ty >= 0); } _source(s), _target(t), _edgeID(v), _weight(w), _forward(f), _backward(b){}
NodeID target() const {return _target; } NodeID target() const {return _target; }
NodeID source() const {return _source; } NodeID source() const {return _source; }
EdgeWeight weight() const {return _weight; } EdgeWeight weight() const {return _weight; }
NodeID id() const { return _edgeID; } NodeID id() const { return _edgeID; }
// short turnInstruction() const { assert(_turnInstruction >= 0); return _turnInstruction; }
bool isBackward() const { return _backward; } bool isBackward() const { return _backward; }
bool isForward() const { return _forward; } bool isForward() const { return _forward; }
// unsigned getNameIDOfTurnTarget() const { return _nameID1; }
NodeID _source; NodeID _source;
NodeID _target; NodeID _target;
NodeID _edgeID; NodeID _edgeID;
// unsigned _nameID1;
EdgeWeight _weight; EdgeWeight _weight;
bool _forward; bool _forward;
bool _backward; bool _backward;
// short _turnInstruction;
}; };
struct MinimalEdgeData { struct MinimalEdgeData {

1
DataStructures/SearchEngine.h
View File

@ -525,7 +525,6 @@ private:
recursionStack.push(std::make_pair(edge.first, middle)); recursionStack.push(std::make_pair(edge.first, middle));
} else { } else {
assert(!ed.shortcut); assert(!ed.shortcut);
//TODO: Hier die lookups in den nodehelpdeks machen
unpackedPath.push_back(_PathData(ed.id, nodeHelpDesk->getNameIndexFromEdgeID(ed.id), nodeHelpDesk->getTurnInstructionFromEdgeID(ed.id), ed.distance) ); unpackedPath.push_back(_PathData(ed.id, nodeHelpDesk->getNameIndexFromEdgeID(ed.id), nodeHelpDesk->getTurnInstructionFromEdgeID(ed.id), ed.distance) );
} }
} }

2
Docs

@ -1 +1 @@
Subproject commit bab2887f8f7b17d6346e5f18d0464a66d8ae4e98 Subproject commit fb995ad0b006ba90d0c5497e8c49ec215537c016