reorder members of internal extractor edge. 56->40 bytes

This commit is contained in:
Dennis Luxen 2015-01-16 17:11:30 +01:00
parent 061d281d2a
commit 7ba9b97afc

View File

@ -38,9 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct InternalExtractorEdge struct InternalExtractorEdge
{ {
InternalExtractorEdge() InternalExtractorEdge()
: start(0), target(0), direction(0), speed(0), name_id(0), is_roundabout(false), : start(0), target(0), speed(0), name_id(0), direction(0), is_roundabout(false),
is_in_tiny_cc(false), is_duration_set(false), is_access_restricted(false), is_in_tiny_cc(false), is_duration_set(false), is_access_restricted(false),
travel_mode(TRAVEL_MODE_INACCESSIBLE), is_split(false) is_split(false), travel_mode(TRAVEL_MODE_INACCESSIBLE)
{ {
} }
@ -55,10 +55,10 @@ struct InternalExtractorEdge
bool is_access_restricted, bool is_access_restricted,
TravelMode travel_mode, TravelMode travel_mode,
bool is_split) bool is_split)
: start(start), target(target), direction(direction), speed(speed), : start(start), target(target), speed(speed), name_id(name_id),
name_id(name_id), is_roundabout(is_roundabout), is_in_tiny_cc(is_in_tiny_cc), direction(direction), is_roundabout(is_roundabout), is_in_tiny_cc(is_in_tiny_cc),
is_duration_set(is_duration_set), is_access_restricted(is_access_restricted), is_duration_set(is_duration_set), is_access_restricted(is_access_restricted),
travel_mode(travel_mode), is_split(is_split) is_split(is_split), travel_mode(travel_mode)
{ {
} }
@ -75,15 +75,15 @@ struct InternalExtractorEdge
NodeID start; NodeID start;
NodeID target; NodeID target;
short direction;
double speed; double speed;
unsigned name_id; unsigned name_id;
bool is_roundabout; short direction;
bool is_in_tiny_cc; bool is_roundabout:1;
bool is_duration_set; bool is_in_tiny_cc:1;
bool is_access_restricted; bool is_duration_set:1;
bool is_access_restricted:1;
bool is_split:1;
TravelMode travel_mode : 4; TravelMode travel_mode : 4;
bool is_split;
FixedPointCoordinate source_coordinate; FixedPointCoordinate source_coordinate;
FixedPointCoordinate target_coordinate; FixedPointCoordinate target_coordinate;