enum ArrivalState
{
ON_THE_WAY,
+ WAITING_FOR_SEQUENCE,
RESERVED_TO_END,
+ ADVANCED_TO_END,
ARRIVED
};
RouteList routes;
RouteList::iterator reserving_route;
ArrivalState arrival;
- const TrackChain *destination;
std::vector<const TrackChain *> waypoints;
- bool destination_changed;
+ bool waypoints_changed;
std::vector<TrainRouteMetric *> metrics;
bool metrics_stale;
std::list<SequencePoint> sequence_points;
const Route *get_route() const;
unsigned get_current_sequence() const { return current_sequence; }
private:
+ void use_planned_route();
void route_changed();
public:
void set_destination(const TrackChain &);
- const TrackChain *get_destination() const { return destination; }
+ const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back(); }
void add_waypoint(const TrackChain &);
unsigned get_n_waypoints() const { return waypoints.size(); }
const TrackChain &get_waypoint(unsigned) const;
void train_rear_advanced(Block &);
void create_metrics();
- Route *create_lead_route(Route *, const Route *);
- bool is_valid_for_track(const Route &, Track &) const;
- bool advance_to_track(RouteList::iterator &, Track &);
+ bool create_lead_route();
+ bool advance_to_track(RouteList::iterator &, const TrackIter &);
+ static void get_routers(Layout &, std::vector<TrainRouter *> &);
static void start_planning(Layout &);
+ static void apply_plan(Layout &, TrainRoutePlanner &);
};
} // namespace R2C2