Penalize steps other than the fastest one

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 153eda0532dfc369d48f34aabc77fff068a3ec51..85a748c204099bd4e5cff2947ce5962a687528a1 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -33,6 +33,10 @@ private:
                Train *train;
                float speed;
                TrainRouter *router;
+               const TrackChain *destination;
+               std::vector<const TrackChain *> waypoints;
+               std::vector<const TrainRouteMetric *> metrics;
+               bool has_duration;
                std::list<Route *> routes;
                Track *track_history[2];
                std::list<TrainRouter::SequencePoint> sequence;
@@ -71,6 +75,7 @@ private:
                float back_offset;
                TrainState state;
                Msp::Time::TimeDelta delay;
+               Msp::Time::TimeDelta duration;
                int waypoint;
                float distance_traveled;
                float remaining_estimate;
@@ -93,6 +98,7 @@ private:
        struct RoutingStep
        {
                Msp::Time::TimeDelta time;
+               Msp::Time::TimeDelta penalty;
                Msp::Time::TimeDelta cost_estimate;
                std::vector<TrainRoutingState> trains;
                const RoutingStep *prev;