X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=153eda0532dfc369d48f34aabc77fff068a3ec51;hb=997e14793d8e58d3cb14a495970b36b1e0cad39b;hp=c6ca741555282c767bf7247e76c6fa49407aabb3;hpb=5eeb8f5749586b9aae2996d2143e300388d15611;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c6ca741..153eda0 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,32 +14,28 @@ 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;
 		TrainRouter *router;
 		std::list<Route *> routes;
-		Track *track_history[3];
-		std::list<SequencingInfo> sequence;
+		Track *track_history[2];
+		std::list<TrainRouter::SequencePoint> sequence;
 
 		TrainRoutingInfo(Train &);
 	};
@@ -115,18 +113,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