X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=c4850d46a61c00185f9630b8259885d0582b5f5e;hb=7f63edbdf0d3c08893bdd2341ec3e50fb1ccc6f8;hp=57d2de508cdc27be0dbc17c3953d24bc2d9c4c61;hpb=1203771e5aa9b12dca147cd1a84ece9a01c0fccd;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 57d2de5..c4850d4 100644
--- 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,10 +14,17 @@ class Layout;
 class Route;
 class Track;
 class Train;
-class TrainRouter;
 
 class TrainRoutePlanner
 {
+public:
+	enum Result
+	{
+		PENDING,
+		COMPLETE,
+		FAILED
+	};
+
 private:
 	struct TrainRoutingState;
 
@@ -25,8 +34,8 @@ private:
 		float speed;
 		TrainRouter *router;
 		std::list<Route *> routes;
-		Track *track_history[3];
-		std::list<const TrainRoutingState *> waits;
+		Track *track_history[2];
+		std::list<TrainRouter::SequencePoint> sequence;
 
 		TrainRoutingInfo(Train &);
 	};
@@ -62,6 +71,7 @@ private:
 		float back_offset;
 		TrainState state;
 		Msp::Time::TimeDelta delay;
+		Msp::Time::TimeDelta duration;
 		int waypoint;
 		float distance_traveled;
 		float remaining_estimate;
@@ -104,18 +114,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