Be more permissive when checking route continuity

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 589c7297d648858472026be5ef8b42dc1459f948..9fab2892efe15803da1f413277f7a6bd25678122 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -43,7 +43,9 @@ private:
        enum ArrivalState
        {
                ON_THE_WAY,
+               WAITING_FOR_SEQUENCE,
                RESERVED_TO_END,
+               ADVANCED_TO_END,
                ARRIVED
        };
 
@@ -57,15 +59,15 @@ private:
        RouteList routes;
        RouteList::iterator reserving_route;
        ArrivalState arrival;
-       const TrackChain *destination;
        std::vector<const TrackChain *> waypoints;
-       bool destination_changed;
+       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;
+       Msp::Time::TimeDelta duration;
        Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -79,18 +81,20 @@ public:
        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(); }
        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 &);
@@ -100,13 +104,15 @@ public:
 private:
        void block_reserved(Block &, Train *);
        void train_advanced(Block &);
+       void train_rear_advanced(Block &);
 
        void create_metrics();
-       Route *create_lead_route(Route *, const Route *);
-       bool is_valid_for_track(const Route &, Track &) const;
-       bool advance_to_track(RouteList::iterator &, Track &);
+       bool create_lead_route();
+       bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
+       static void get_routers(Layout &, std::vector<TrainRouter *> &);
        static void start_planning(Layout &);
+       static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2