X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=0ed2e118e7bb4e5ef503769f7ef3c765848752e2;hb=bb75bc76ddd99e7d3edaf6e7dbd3719ea332052c;hp=f5bbf570d2fecc52d7027eaf850f410ce8178580;hpb=3de7ae761b9a1fd1c1cd40457cc7067f4cf57c36;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index f5bbf57..0ed2e11 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <vector>
+#include <msp/core/thread.h>
 #include <msp/time/timedelta.h>
 #include "trackiter.h"
 #include "trainrouter.h"
@@ -31,9 +32,14 @@ private:
 	{
 		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];
+		Track *track_history[2];
 		std::list<TrainRouter::SequencePoint> sequence;
 
 		TrainRoutingInfo(Train &);
@@ -64,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;
@@ -92,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;
@@ -112,23 +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 &);
+	~TrainRoutePlanner();
 
-	void plan();
+	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