Add a function to check if a track chain forms a loop

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 9efc3a6001cf6bc811d101b8fb8a6b54b5f1e81e..c1b6977f3734d45b19f615146c899d0ef22dedc0 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -11,6 +11,7 @@ class Block;
 class Layout;
 class Track;
 class TrackChain;
+class TrainRouteMetric;
 
 class TrainRouter: public TrainAI
 {
@@ -25,6 +26,7 @@ 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:
        struct Wait
@@ -42,6 +44,7 @@ private:
        unsigned arriving;
        const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
+       std::vector<TrainRouteMetric *> metrics;
        std::list<Wait> waits;
        Msp::Time::TimeDelta delay;
 
@@ -49,11 +52,13 @@ private:
 
 public:
        TrainRouter(Train &);
+       ~TrainRouter();
 
        void set_priority(int);
        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;
 
@@ -63,6 +68,7 @@ public:
        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; }
 
@@ -76,6 +82,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 &);