X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=57d2de508cdc27be0dbc17c3953d24bc2d9c4c61;hb=1203771e5aa9b12dca147cd1a84ece9a01c0fccd;hp=2ae7dc4ef6e502d6f27f263cb67c24a453321a8d;hpb=055d7e80b68c8f77ebf226ffd48c37a7e504940c;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index 2ae7dc4..57d2de5 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -24,8 +24,9 @@ private:
 		Train *train;
 		float speed;
 		TrainRouter *router;
-		Route *route;
-		std::list<TrainRoutingState *> waits;
+		std::list<Route *> routes;
+		Track *track_history[3];
+		std::list<const TrainRoutingState *> waits;
 
 		TrainRoutingInfo(Train &);
 	};
@@ -62,27 +63,42 @@ private:
 		TrainState state;
 		Msp::Time::TimeDelta delay;
 		int waypoint;
+		float distance_traveled;
+		float remaining_estimate;
+		Msp::Time::TimeDelta wait_time;
+		int blocked_by;
 
 		TrainRoutingState(TrainRoutingInfo &);
 		TrainRoutingState(const TrainRoutingState &);
 		~TrainRoutingState();
 
 		Msp::Time::TimeDelta get_time_to_next_track() const;
-		bool is_occupied(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();
 	};
 
 	struct RoutingStep
 	{
 		Msp::Time::TimeDelta time;
+		Msp::Time::TimeDelta cost_estimate;
 		std::vector<TrainRoutingState> trains;
-		RoutingStep *prev;
+		const RoutingStep *prev;
 
 		RoutingStep();
-		RoutingStep(RoutingStep *);
+		RoutingStep(const RoutingStep *);
 
+		void create_successors(std::list<RoutingStep> &) const;
+		bool update_states();
+		bool check_deadlocks() const;
+		int get_occupant(Track &) const;
+		int find_next_train() const;
 		void advance(const Msp::Time::TimeDelta &);
+		void update_estimate();
+		bool is_viable() const;
 		bool is_goal() const;
 
 		bool operator<(const RoutingStep &) const;
@@ -90,18 +106,16 @@ private:
 
 	std::vector<TrainRoutingInfo> routed_trains;
 	std::list<RoutingStep> steps;
+	std::list<RoutingStep> queue;
 
 public:
 	TrainRoutePlanner(Layout &);
 
 	void plan();
 private:
-	bool update_states(RoutingStep &);
-	int find_next_train(RoutingStep &);
-	void add_steps(RoutingStep &, unsigned);
-	void add_waiting_step(RoutingStep &, unsigned);
-	void add_steps(RoutingStep &, TrainRoutingState &train);
-	void create_routes(RoutingStep &);
+	const RoutingStep &get_step();
+	void add_steps(const RoutingStep &);
+	void create_routes(const RoutingStep &);
 };
 
 } // namespace R2C2