X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=47d00b8079d4f3062702ed3a040e086cb6157e77;hb=44e13f6732f206aa72ff7b001d77fe59bf2830ee;hp=fa97920e4d02730469ab1d5a190377891cf63126;hpb=dd41422054c277b44059d5d2d127ce34a2c2119f;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index fa97920..47d00b8 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -31,10 +31,11 @@ private:
 	struct TrainRoutingInfo
 	{
 		Train *train;
+		float length;
 		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;
@@ -69,17 +70,19 @@ 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;
+		unsigned waypoint;
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
+		Msp::Time::TimeDelta estimated_wait;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -87,18 +90,22 @@ 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 set_path(unsigned);
 		void update_estimate();
+		bool is_viable() const;
 	};
 
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
 		Msp::Time::TimeDelta cost_estimate;
+		bool preferred;
 		std::vector<TrainRoutingState> trains;
 		const RoutingStep *prev;
 
@@ -106,6 +113,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;
@@ -134,6 +142,8 @@ private:
 	std::list<RoutingStep> steps;
 	std::list<RoutingStep> queue;
 	const RoutingStep *goal;
+	Msp::Time::TimeDelta path_switch_bias;
+	Msp::Time::TimeDelta timeout;
 	Result result;
 	PlanningThread *thread;
 
@@ -141,10 +151,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: