X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=32c9dadc3494671dcbe805c6fcf1ff4bee5b5247;hb=cac4176a9685e8b39147d1e18d969b3bee052b03;hp=c7572c0df41cb48c548fa2c4b0cb40f6afdd4453;hpb=8776713b20fdc7cdd09f7e2363679ebd06665d32;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c7572c0..32c9dad 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;
-		std::vector<const TrackChain *> waypoints;
+		std::vector<TrainRouter::Waypoint> waypoints;
 		std::vector<const TrainRouteMetric *> metrics;
 		bool has_duration;
 		std::list<Route *> routes;
@@ -81,6 +82,7 @@ private:
 		float distance_traveled;
 		float remaining_estimate;
 		Msp::Time::TimeDelta wait_time;
+		Msp::Time::TimeDelta estimated_wait;
 		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
@@ -88,6 +90,7 @@ 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);
@@ -100,8 +103,8 @@ private:
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
-		Msp::Time::TimeDelta penalty;
 		Msp::Time::TimeDelta cost_estimate;
+		bool preferred;
 		std::vector<TrainRoutingState> trains;
 		const RoutingStep *prev;
 
@@ -109,6 +112,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 +141,7 @@ 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;