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

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index c4850d4..c7572c0 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -32,7 +32,11 @@ private:
 	{
 		Train *train;
 		float speed;
+		Block *first_noncritical;
 		TrainRouter *router;
+		std::vector<const TrackChain *> waypoints;
+		std::vector<const TrainRouteMetric *> metrics;
+		bool has_duration;
 		std::list<Route *> routes;
 		Track *track_history[2];
 		std::list<TrainRouter::SequencePoint> sequence;
@@ -65,14 +69,15 @@ 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;
@@ -89,11 +94,13 @@ private:
 		void advance(const Msp::Time::TimeDelta &);
 		void advance_track(unsigned);
 		void update_estimate();
+		bool is_viable() const;
 	};
 
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
+		Msp::Time::TimeDelta penalty;
 		Msp::Time::TimeDelta cost_estimate;
 		std::vector<TrainRoutingState> trains;
 		const RoutingStep *prev;
@@ -130,6 +137,7 @@ private:
 	std::list<RoutingStep> steps;
 	std::list<RoutingStep> queue;
 	const RoutingStep *goal;
+	Msp::Time::TimeDelta timeout;
 	Result result;
 	PlanningThread *thread;
 
@@ -137,10 +145,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: