Keep better track of routes

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index c1b6977f3734d45b19f615146c899d0ef22dedc0..1c523d89e96fe1d2d1c7bb04fa9d4f141d95b76b 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -12,6 +12,7 @@ class Layout;
 class Track;
 class TrackChain;
 class TrainRouteMetric;
+class TrainRoutePlanner;
 
 class TrainRouter: public TrainAI
 {
@@ -28,27 +29,35 @@ public:
        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;
+
+               SequencePoint(Block &, unsigned);
 
-               Wait();
+               bool is_cleared() const;
        };
 
+private:
        typedef std::list<const Route *> RouteList;
 
        int priority;
        RouteList routes;
+       RouteList::iterator reserving_route;
        unsigned arriving;
        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::RefPtr<TrainRoutePlanner> planner;
 
 public:
        TrainRouter(Train &);
@@ -58,10 +67,12 @@ public:
        int get_priority() const { return priority; }
 
        bool set_route(const Route *);
-       bool add_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;
@@ -84,10 +95,10 @@ private:
 
        void create_metrics();
        Route *create_lead_route(Route *, const Route *);
-       bool advance_route(RouteList::iterator &, const Block &);
-       bool is_on_route(const Block &);
+       bool is_valid_for_track(const Route &, Track &) const;
+       bool advance_to_track(RouteList::iterator &, Track &);
 
-       static void create_plans(Layout &);
+       static void start_planning(Layout &);
 };
 
 } // namespace R2C2