class Track;
class TrackChain;
class TrainRouteMetric;
+class TrainRoutePlanner;
class TrainRouter: public TrainAI
{
void route(const std::string &);
};
- sigc::signal<void, const Route *> signal_route_changed;
- sigc::signal<void, const TrackChain *> signal_arrived;
- sigc::signal<void, const TrackChain *> signal_waypoint_reached;
-
-private:
- struct Wait
+ struct SequencePoint
{
Block *block;
- Train *train;
+ Train *preceding_train;
+ unsigned sequence_in;
+ unsigned sequence_out;
- Wait();
+ SequencePoint(Block &, unsigned);
+
+ bool is_cleared() const;
};
+private:
typedef std::list<const Route *> RouteList;
+ enum ArrivalState
+ {
+ ON_THE_WAY,
+ RESERVED_TO_END,
+ ARRIVED
+ };
+
+public:
+ sigc::signal<void, const Route *> signal_route_changed;
+ sigc::signal<void, const TrackChain *> signal_arrived;
+ sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+
+private:
int priority;
RouteList routes;
- unsigned arriving;
+ RouteList::iterator reserving_route;
+ ArrivalState arrival;
const TrackChain *destination;
std::vector<const TrackChain *> waypoints;
+ bool destination_changed;
std::vector<TrainRouteMetric *> metrics;
- std::list<Wait> waits;
+ bool metrics_stale;
+ std::list<SequencePoint> sequence_points;
+ unsigned current_sequence;
+ bool sequence_check_pending;
Msp::Time::TimeDelta delay;
-
- bool update_pending;
+ Msp::Time::TimeDelta duration;
+ Msp::RefPtr<TrainRoutePlanner> planner;
public:
TrainRouter(Train &);
int get_priority() const { return priority; }
bool set_route(const Route *);
- void add_wait(Block &, Train *);
const Route *get_route() const;
+ unsigned get_current_sequence() const { return current_sequence; }
+private:
+ void route_changed();
+public:
void set_destination(const TrackChain &);
const TrackChain *get_destination() const { return destination; }
- bool is_destination(Track &) const;
void add_waypoint(const TrackChain &);
unsigned get_n_waypoints() const { return waypoints.size(); }
- bool is_waypoint(unsigned, Track &) const;
+ const TrackChain &get_waypoint(unsigned) const;
const TrainRouteMetric &get_metric(int = -1) const;
void set_departure_delay(const Msp::Time::TimeDelta &);
const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
+ void set_trip_duration(const Msp::Time::TimeDelta &);
+ const Msp::Time::TimeDelta &get_trip_duration() const { return duration; }
virtual void message(const Message &);
virtual void tick(const Msp::Time::TimeDelta &);
private:
void block_reserved(Block &, Train *);
void train_advanced(Block &);
- const Route *get_route_for_block(const Block &) const;
+ void train_rear_advanced(Block &);
void create_metrics();
- Route *create_lead_route(Route *, const Route *);
- bool advance_route(RouteList::iterator &, const Block &);
- bool is_on_route(const Block &);
+ bool create_lead_route();
+ bool is_valid_for_track(const Route &, const TrackIter &) const;
+ bool advance_to_track(RouteList::iterator &, const TrackIter &);
- static void create_plans(Layout &);
+ static void start_planning(Layout &);
};
} // namespace R2C2