Move duplicated successor step creation code to a function

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index b76d663ab5f8caea318ec2bf612bc1d4ab9d83c4..3076c3978efa5ed0b27edae5cec7b4130e72afa7 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,7 +34,7 @@ private:
                float speed;
                Block *first_noncritical;
                TrainRouter *router;
-               std::vector<const TrackChain *> waypoints;
+               std::vector<TrainRouter::Waypoint> waypoints;
                std::vector<const TrainRouteMetric *> metrics;
                bool has_duration;
                std::list<Route *> routes;
@@ -94,6 +94,7 @@ private:
                void advance(const Msp::Time::TimeDelta &);
                void advance_track(unsigned);
                void update_estimate();
+               bool is_viable() const;
        };
 
        struct RoutingStep
@@ -108,6 +109,7 @@ private:
                RoutingStep(const RoutingStep *);
 
                void create_successors(std::list<RoutingStep> &) const;
+               static void create_successor(RoutingStep &, unsigned, unsigned, std::list<RoutingStep> &);
                bool update_states();
                bool check_deadlocks() const;
                int get_occupant(Track &) const;
@@ -136,6 +138,7 @@ private:
        std::list<RoutingStep> steps;
        std::list<RoutingStep> queue;
        const RoutingStep *goal;
+       Msp::Time::TimeDelta timeout;
        Result result;
        PlanningThread *thread;
 
@@ -143,6 +146,7 @@ public:
        TrainRoutePlanner(Layout &);
        ~TrainRoutePlanner();
 
+       void set_timeout(const Msp::Time::TimeDelta &);
        Result plan();
        void plan_async();
        Result check();