X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=f5bbf570d2fecc52d7027eaf850f410ce8178580;hb=3de7ae761b9a1fd1c1cd40457cc7067f4cf57c36;hp=f50669cc2c53561c5ab29e0aebe52aef89154584;hpb=8c31771a3252f3717ce53fd33567c74003c7cd1a;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h
index f50669c..f5bbf57 100644
--- a/source/libr2c2/trainrouteplanner.h
+++ b/source/libr2c2/trainrouteplanner.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <msp/time/timedelta.h>
 #include "trackiter.h"
+#include "trainrouter.h"
 
 namespace R2C2 {
 
@@ -12,10 +13,17 @@ class Layout;
 class Route;
 class Track;
 class Train;
-class TrainRouter;
 
 class TrainRoutePlanner
 {
+public:
+	enum Result
+	{
+		PENDING,
+		COMPLETE,
+		FAILED
+	};
+
 private:
 	struct TrainRoutingState;
 
@@ -24,8 +32,9 @@ private:
 		Train *train;
 		float speed;
 		TrainRouter *router;
-		Route *route;
-		std::list<TrainRoutingState *> waits;
+		std::list<Route *> routes;
+		Track *track_history[3];
+		std::list<TrainRouter::SequencePoint> sequence;
 
 		TrainRoutingInfo(Train &);
 	};
@@ -62,6 +71,9 @@ 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 &);
@@ -69,25 +81,31 @@ private:
 		~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;
 
@@ -96,17 +114,21 @@ private:
 
 	std::vector<TrainRoutingInfo> routed_trains;
 	std::list<RoutingStep> steps;
+	std::list<RoutingStep> queue;
+	Result result;
 
 public:
 	TrainRoutePlanner(Layout &);
 
 	void plan();
+	Result get_result() { return result; }
+	const std::list<Route *> &get_routes_for(const Train &) const;
+	const std::list<TrainRouter::SequencePoint> &get_sequence_for(const Train &) const;
 private:
-	bool update_states(RoutingStep &);
-	void add_steps(RoutingStep &, unsigned);
-	void add_waiting_step(RoutingStep &, unsigned);
-	void add_steps(RoutingStep &, TrainRoutingState &train);
-	void create_routes(RoutingStep &);
+	const TrainRoutingInfo &get_train_info(const Train &) const;
+	const RoutingStep &get_step();
+	void add_steps(const RoutingStep &);
+	void create_routes(const RoutingStep &);
 };
 
 } // namespace R2C2