use 4 bits for travel mode

2014-08-11 14:07:00 +02:00
parent 6d6d299ea4
commit dae9c9a7ed
12 changed files with 25 additions and 19 deletions
@@ -43,7 +43,7 @@ struct EdgeBasedNode
        unsigned packed_geometry_id,
        unsigned short fwd_segment_position,
        bool belongs_to_tiny_component,
-        TravelMode travel_mode,
+        TravelMode travel_mode ,
        TravelMode backward_travel_mode
    ) :
        forward_edge_based_node_id(forward_edge_based_node_id),
@@ -91,8 +91,8 @@ struct EdgeBasedNode
    unsigned packed_geometry_id; // if set, then the edge represents a packed geometry
    unsigned short fwd_segment_position; // segment id in a compressed geometry
    bool is_in_tiny_cc;
-    TravelMode travel_mode;
-    TravelMode backward_travel_mode;
+    TravelMode travel_mode : 4;
+    TravelMode backward_travel_mode : 4;
 };

 #endif //EDGE_BASED_NODE_H
@@ -58,7 +58,7 @@ struct NodeBasedEdge
    bool in_tiny_cc : 1;
    bool access_restricted : 1;
    bool is_split : 1;
-    TravelMode travel_mode;
+    TravelMode travel_mode : 4;

    NodeBasedEdge() = delete;
 };
@@ -29,7 +29,7 @@ struct NodeBasedEdgeData
    bool backward : 1;
    bool roundabout : 1;
    bool ignore_in_grid : 1;
-    TravelMode travel_mode;
+    TravelMode travel_mode : 4;

    void SwapDirectionFlags()
    {
@@ -79,8 +79,8 @@ struct PhantomNode
    unsigned packed_geometry_id;
    FixedPointCoordinate location;
    unsigned short fwd_segment_position;
-    TravelMode travel_mode;
-    TravelMode backward_travel_mode;
+    TravelMode travel_mode : 4;
+    TravelMode backward_travel_mode : 4;
    
    int GetForwardWeightPlusOffset() const
    {
@@ -59,7 +59,7 @@ struct PathData
    unsigned name_id;
    EdgeWeight segment_duration;
    TurnInstruction turn_instruction;
-    TravelMode travel_mode;
+    TravelMode travel_mode : 4;
 };

 struct RawRouteData
@@ -45,7 +45,7 @@ struct SegmentInformation
    TurnInstruction turn_instruction;
    bool necessary:1;
    bool is_via_location:1;
-    TravelMode  travel_mode;
+    TravelMode  travel_mode : 4;
    
    explicit SegmentInformation(const FixedPointCoordinate &location,
                                const NodeID name_id,