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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 5d52f10..47d00b8 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -31,6 +31,7 @@ private:
 	struct TrainRoutingInfo
 	{
 		Train *train;
+		float length;
 		float speed;
 		Block *first_noncritical;
 		TrainRouter *router;
@@ -95,6 +96,7 @@ private:
 		void advance(float);
 		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
+		void set_path(unsigned);
 		void update_estimate();
 		bool is_viable() const;
 	};
@@ -102,8 +104,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;
 
@@ -140,6 +142,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;