Replace waits with a more robust sequencing system

[r2c2.git] / source / libr2c2 / trainrouter.h

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 07afe2b722112bb4453b4b994ad7b517fff207f1..6f697f997b6349ba686b409022ce9e1d6fd79e86 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -9,9 +9,9 @@ namespace R2C2 {
 
 class Block;
 class Layout;
-class Route;
 class Track;
-class Zone;
+class TrackChain;
+class TrainRouteMetric;
 
 class TrainRouter: public TrainAI
 {
@@ -25,45 +25,61 @@ public:
        };
 
        sigc::signal<void, const Route *> signal_route_changed;
-       sigc::signal<void> signal_arrived;
+       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);
        };
 
        typedef std::list<const Route *> RouteList;
 
        int priority;
        RouteList routes;
-       bool arriving;
-       const Zone *dest_zone;
-       const Block *dest_block;
-       std::list<Wait> waits;
+       unsigned arriving;
+       const TrackChain *destination;
+       std::vector<const TrackChain *> waypoints;
+       std::vector<TrainRouteMetric *> metrics;
+       std::list<SequencePoint> sequence_points;
+       std::list<SequencePoint *> pending_sequence_checks;
+       unsigned current_sequence;
+       Msp::Time::TimeDelta delay;
 
        bool update_pending;
 
 public:
        TrainRouter(Train &);
+       ~TrainRouter();
 
        void set_priority(int);
        int get_priority() const { return priority; }
 
        bool set_route(const Route *);
-       void add_wait(Block &, Train *);
+       bool add_route(const Route &);
        const Route *get_route() const;
+       void add_sequence_point(Block &, unsigned);
+       void add_sequence_point(Block &, Train &, unsigned, unsigned);
+       unsigned get_current_sequence() const { return current_sequence; }
 
-       void set_destination(const Zone &);
-       void set_destination(const Block &);
-       bool has_destination() const;
+       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 TrainRouteMetric &get_metric(int = -1) const;
+       void set_departure_delay(const Msp::Time::TimeDelta &);
+       const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
 
        virtual void message(const Message &);
-       virtual void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+       virtual void tick(const Msp::Time::TimeDelta &);
 
        void save(std::list<Msp::DataFile::Statement> &) const;
 
@@ -72,6 +88,7 @@ private:
        void train_advanced(Block &);
        const Route *get_route_for_block(const Block &) const;
 
+       void create_metrics();
        Route *create_lead_route(Route *, const Route *);
        bool advance_route(RouteList::iterator &, const Block &);
        bool is_on_route(const Block &);