X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=5d52f10186d6699e709fb6c2967dcf1b3cdf5aff;hb=2225814e69913aecaee53b0505d1b92197621b10;hp=0ed2e118e7bb4e5ef503769f7ef3c765848752e2;hpb=bb75bc76ddd99e7d3edaf6e7dbd3719ea332052c;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 0ed2e11..5d52f10 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -34,8 +34,7 @@ private:
 		float speed;
 		Block *first_noncritical;
 		TrainRouter *router;
-		const TrackChain *destination;
-		std::vector<const TrackChain *> waypoints;
+		std::vector<TrainRouter::Waypoint> waypoints;
 		std::vector<const TrainRouteMetric *> metrics;
 		bool has_duration;
 		std::list<Route *> routes;
@@ -78,10 +77,11 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		Msp::Time::TimeDelta duration;
-		int waypoint;
+		unsigned waypoint;
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
+		Msp::Time::TimeDelta estimated_wait;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -89,12 +89,14 @@ private:
 		~TrainRoutingState();
 
 		Msp::Time::TimeDelta get_time_to_next_track() const;
+		Msp::Time::TimeDelta get_time_to_pass(Track &) const;
 		bool is_occupying(Track &) const;
 		bool check_arrival();
 		void advance(float);
 		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
 		void update_estimate();
+		bool is_viable() const;
 	};
 
 	struct RoutingStep
@@ -109,6 +111,7 @@ private:
 		RoutingStep(const RoutingStep *);
 
 		void create_successors(std::list<RoutingStep> &) const;
+		static void create_successor(RoutingStep &, unsigned, unsigned, std::list<RoutingStep> &);
 		bool update_states();
 		bool check_deadlocks() const;
 		int get_occupant(Track &) const;
@@ -137,6 +140,7 @@ private:
 	std::list<RoutingStep> steps;
 	std::list<RoutingStep> queue;
 	const RoutingStep *goal;
+	Msp::Time::TimeDelta timeout;
 	Result result;
 	PlanningThread *thread;
 
@@ -144,10 +148,11 @@ public:
 	TrainRoutePlanner(Layout &);
 	~TrainRoutePlanner();
 
+	void set_timeout(const Msp::Time::TimeDelta &);
 	Result plan();
 	void plan_async();
 	Result check();
-	Result get_result() { return result; }
+	Result get_result() const { return result; }
 	const std::list<Route *> &get_routes_for(const Train &) const;
 	const std::list<TrainRouter::SequencePoint> &get_sequence_for(const Train &) const;
 private: