Replace waits with a more robust sequencing system

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index f7994200a33d6d3ff39f4029aeb25e263a8fcea9..c6ca741555282c767bf7247e76c6fa49407aabb3 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -18,6 +18,17 @@ class TrainRoutePlanner
 {
 private:
        struct TrainRoutingState;
+       struct TrainRoutingInfo;
+
+       struct SequencingInfo
+       {
+               Track *track;
+               TrainRoutingInfo *preceding;
+               unsigned sequence_in;
+               unsigned sequence_out;
+
+               SequencingInfo(Track *, unsigned);
+       };
 
        struct TrainRoutingInfo
        {
@@ -26,7 +37,7 @@ private:
                TrainRouter *router;
                std::list<Route *> routes;
                Track *track_history[3];
-               std::list<const TrainRoutingState *> waits;
+               std::list<SequencingInfo> sequence;
 
                TrainRoutingInfo(Train &);
        };
@@ -63,7 +74,9 @@ private:
                TrainState state;
                Msp::Time::TimeDelta delay;
                int waypoint;
-               Msp::Time::TimeDelta remaining_estimate;
+               float distance_traveled;
+               float remaining_estimate;
+               Msp::Time::TimeDelta wait_time;
                int blocked_by;
 
                TrainRoutingState(TrainRoutingInfo &);
@@ -74,6 +87,7 @@ private:
                bool is_occupying(Track &) const;
                bool check_arrival();
                void advance(float);
+               void advance(const Msp::Time::TimeDelta &);
                void advance_track(unsigned);
                void update_estimate();
        };
@@ -81,7 +95,7 @@ private:
        struct RoutingStep
        {
                Msp::Time::TimeDelta time;
-               Msp::Time::TimeDelta total_estimate;
+               Msp::Time::TimeDelta cost_estimate;
                std::vector<TrainRoutingState> trains;
                const RoutingStep *prev;