Allow direction to be specified for routing waypoints

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index c518522590bc4fdda11cf330b8a5532ffc4d7d56..835ec484737761663da76d30eb97246d0a6178bd 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <msp/datafile/objectloader.h>
+#include "trackchain.h"
 #include "trainai.h"
 
 namespace R2C2 {
@@ -10,7 +11,8 @@ namespace R2C2 {
 class Block;
 class Layout;
 class Track;
-class TrackChain;
+class TrainRouteMetric;
+class TrainRoutePlanner;
 
 class TrainRouter: public TrainAI
 {
@@ -23,44 +25,84 @@ public:
                void route(const std::string &);
        };
 
-       sigc::signal<void, const Route *> signal_route_changed;
-       sigc::signal<void> signal_arrived;
+       struct Waypoint
+       {
+               const TrackChain *chain;
+               TrackChain::Direction direction;
 
-private:
-       struct Wait
+               Waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
+       };
+
+       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,
+               WAITING_FOR_SEQUENCE,
+               RESERVED_TO_END,
+               ADVANCED_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;
-       const TrackChain *destination;
-       std::list<Wait> waits;
+       RouteList::iterator reserving_route;
+       ArrivalState arrival;
+       std::vector<Waypoint> waypoints;
+       bool waypoints_changed;
+       std::vector<TrainRouteMetric *> metrics;
+       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 &);
+       ~TrainRouter();
 
        void set_priority(int);
        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 use_planned_route();
+       void route_changed();
 
+public:
        void set_destination(const TrackChain &);
-       const TrackChain *get_destination() const { return destination; }
-       bool is_destination(Track &) const;
+       const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back().chain; }
+       void add_waypoint(const TrackChain &, TrackChain::Direction = TrackChain::UNSPECIFIED);
+       unsigned get_n_waypoints() const { return waypoints.size(); }
+       const Waypoint &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 &);
@@ -70,13 +112,15 @@ public:
 private:
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
-       const Route *get_route_for_block(const Block &) const;
+       void train_rear_advanced(Block &);
 
-       Route *create_lead_route(Route *, const Route *);
-       bool advance_route(RouteList::iterator &, const Block &);
-       bool is_on_route(const Block &);
+       void create_metrics();
+       bool create_lead_route();
+       bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
-       static void create_plans(Layout &);
+       static void get_routers(Layout &, std::vector<TrainRouter *> &);
+       static void start_planning(Layout &);
+       static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2