Restructure lead route generation

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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 4f51b3e107878b07e37cd86fa38d7509d8527208..7a560a11904d7475b961198d191b6103585ec311 100644 (file)
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -66,6 +66,7 @@ private:
        unsigned current_sequence;
        bool sequence_check_pending;
        Msp::Time::TimeDelta delay;
+       Msp::Time::TimeDelta duration;
        Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -84,13 +85,14 @@ private:
 public:
        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 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 &);
@@ -103,7 +105,7 @@ private:
        void train_rear_advanced(Block &);
 
        void create_metrics();
-       Route *create_lead_route(Route *, const Route *);
+       bool create_lead_route();
        bool is_valid_for_track(const Route &, Track &) const;
        bool advance_to_track(RouteList::iterator &, Track &);