Use a better cost estimator for the route planner

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 215cbfd6c9b1660356c375d1d1bb6aa471f8b4d3..57d2de508cdc27be0dbc17c3953d24bc2d9c4c61 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -24,7 +24,8 @@ private:
                Train *train;
                float speed;
                TrainRouter *router;
-               Route *route;
+               std::list<Route *> routes;
+               Track *track_history[3];
                std::list<const TrainRoutingState *> waits;
 
                TrainRoutingInfo(Train &);
@@ -62,7 +63,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 &);
@@ -73,6 +76,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();
        };
@@ -80,7 +84,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;