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

Unnecessary members on edge

Browse Source
This commit is contained in:
Dennis Luxen 2011-07-18 14:18:12 +00:00
parent fdb46f5445
commit 5377e82ca0
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Contractor/Contractor.h
View File

@ -127,8 +127,6 @@ public:
std::swap( edge.source, edge.target ); std::swap( edge.source, edge.target );
edge.data.forward = i->isBackward(); edge.data.forward = i->isBackward();
edge.data.backward = i->isForward(); edge.data.backward = i->isForward();
edge.data.forwardTurn = i->isForwardTurn();
edge.data.backwardTurn = i->isBackwardTurn();
edges.push_back( edge ); edges.push_back( edge );
} }
// std::vector< InputEdge >().swap( inputEdges ); //free memory // std::vector< InputEdge >().swap( inputEdges ); //free memory

16
DataStructures/ImportEdge.h
View File

@ -43,10 +43,10 @@ public:
/** Default constructor. target and weight are set to 0.*/ /** Default constructor. target and weight are set to 0.*/
Edge() : Edge() :
_source(0), _target(0), _name(0), _weight(0), forward(0), backward(0), _type(0), forwardTurn(false), backwardTurn(false) { assert(false); } //shall not be used. _source(0), _target(0), _name(0), _weight(0), forward(0), backward(0), _type(0) { assert(false); } //shall not be used.
explicit Edge(NodeID s, NodeID t, NodeID n, EdgeWeight w, bool f, bool b, short ty) : explicit Edge(NodeID s, NodeID t, NodeID n, EdgeWeight w, bool f, bool b, short ty) :
_source(s), _target(t), _name(n), _weight(w), forward(f), backward(b), _type(ty), forwardTurn(false), backwardTurn(false) { assert(ty >= 0); } _source(s), _target(t), _name(n), _weight(w), forward(f), backward(b), _type(ty) { assert(ty >= 0); }
NodeID target() const {return _target; } NodeID target() const {return _target; }
NodeID source() const {return _source; } NodeID source() const {return _source; }
@ -58,21 +58,13 @@ public:
bool isForward() const { return forward; } bool isForward() const { return forward; }
bool isLocatable() const { return _type != 14; } bool isLocatable() const { return _type != 14; }
bool isForwardTurn() const { return forwardTurn; } NodeID _source;
bool isBackwardTurn() const { return backwardTurn; } NodeID _target;
void setForwardTurn(bool f) { forwardTurn = f; }
void setBackwardTurn(bool b) { backwardTurn = b; }
NodeID _source:31;
NodeID _target:31;
NodeID _name:31; NodeID _name:31;
EdgeWeight _weight:31; EdgeWeight _weight:31;
bool forward:1; bool forward:1;
bool backward:1; bool backward:1;
short _type; short _type;
bool forwardTurn:1;
bool backwardTurn:1;
}; };
struct MinimalEdgeData struct MinimalEdgeData