Don't diverge from critical blocks

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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c6ca741555282c767bf7247e76c6fa49407aabb3..0ed2e118e7bb4e5ef503769f7ef3c765848752e2 100644 (file)
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -3,8 +3,10 @@
 
 #include <list>
 #include <vector>
+#include <msp/core/thread.h>
 #include <msp/time/timedelta.h>
 #include "trackiter.h"
+#include "trainrouter.h"
 
 namespace R2C2 {
 
@@ -12,32 +14,33 @@ class Layout;
 class Route;
 class Track;
 class Train;
-class TrainRouter;
 
 class TrainRoutePlanner
 {
-private:
-       struct TrainRoutingState;
-       struct TrainRoutingInfo;
-
-       struct SequencingInfo
+public:
+       enum Result
        {
-               Track *track;
-               TrainRoutingInfo *preceding;
-               unsigned sequence_in;
-               unsigned sequence_out;
-
-               SequencingInfo(Track *, unsigned);
+               PENDING,
+               COMPLETE,
+               FAILED
        };
 
+private:
+       struct TrainRoutingState;
+
        struct TrainRoutingInfo
        {
                Train *train;
                float speed;
+               Block *first_noncritical;
                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[3];
-               std::list<SequencingInfo> sequence;
+               Track *track_history[2];
+               std::list<TrainRouter::SequencePoint> sequence;
 
                TrainRoutingInfo(Train &);
        };
@@ -67,12 +70,14 @@ private:
        {
                TrainRoutingInfo *info;
                TrackIter track;
-               unsigned path;
+               unsigned char path;
+               bool critical;
                OccupiedTrack *occupied_tracks;
                float offset;
                float back_offset;
                TrainState state;
                Msp::Time::TimeDelta delay;
+               Msp::Time::TimeDelta duration;
                int waypoint;
                float distance_traveled;
                float remaining_estimate;
@@ -95,6 +100,7 @@ private:
        struct RoutingStep
        {
                Msp::Time::TimeDelta time;
+               Msp::Time::TimeDelta penalty;
                Msp::Time::TimeDelta cost_estimate;
                std::vector<TrainRoutingState> trains;
                const RoutingStep *prev;
@@ -115,18 +121,42 @@ private:
                bool operator<(const RoutingStep &) const;
        };
 
+       class PlanningThread: public Msp::Thread
+       {
+       private:
+               TrainRoutePlanner &planner;
+
+       public:
+               PlanningThread(TrainRoutePlanner &);
+
+       private:
+               virtual void main();
+       };
+
        std::vector<TrainRoutingInfo> routed_trains;
        std::list<RoutingStep> steps;
        std::list<RoutingStep> queue;
+       const RoutingStep *goal;
+       Result result;
+       PlanningThread *thread;
 
 public:
        TrainRoutePlanner(Layout &);
-
-       void plan();
+       ~TrainRoutePlanner();
+
+       Result plan();
+       void plan_async();
+       Result check();
+       Result get_result() { return result; }
+       const std::list<Route *> &get_routes_for(const Train &) const;
+       const std::list<TrainRouter::SequencePoint> &get_sequence_for(const Train &) const;
 private:
+       const TrainRoutingInfo &get_train_info(const Train &) const;
        const RoutingStep &get_step();
+       void prepare_plan();
+       void create_plan();
        void add_steps(const RoutingStep &);
-       void create_routes(const RoutingStep &);
+       void finalize_plan();
 };
 
 } // namespace R2C2