X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=4f51b3e107878b07e37cd86fa38d7509d8527208;hb=e5c244baa4058dbfc0c5caee64e6c83523751924;hp=c69d28c9389057c3ea37cb14fd5ed3ed5ad0a52a;hpb=d578d036656c0e89fe9dca5aefd1f81d2777a69e;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index c69d28c..4f51b3e 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -12,6 +12,7 @@ class Layout;
 class Track;
 class TrackChain;
 class TrainRouteMetric;
+class TrainRoutePlanner;
 
 class TrainRouter: public TrainAI
 {
@@ -24,31 +25,48 @@ public:
 		void route(const std::string &);
 	};
 
-	sigc::signal<void, const Route *> signal_route_changed;
-	sigc::signal<void, const TrackChain *> signal_arrived;
-	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
-
-private:
-	struct Wait
+	struct SequencePoint
 	{
 		Block *block;
-		Train *train;
+		Train *preceding_train;
+		unsigned sequence_in;
+		unsigned sequence_out;
 
-		Wait();
+		SequencePoint(Block &, unsigned);
+
+		bool is_cleared() const;
 	};
 
+private:
 	typedef std::list<const Route *> RouteList;
 
+	enum ArrivalState
+	{
+		ON_THE_WAY,
+		RESERVED_TO_END,
+		ARRIVED
+	};
+
+public:
+	sigc::signal<void, const Route *> signal_route_changed;
+	sigc::signal<void, const TrackChain *> signal_arrived;
+	sigc::signal<void, const TrackChain *> signal_waypoint_reached;
+
+private:
 	int priority;
 	RouteList routes;
-	unsigned arriving;
+	RouteList::iterator reserving_route;
+	ArrivalState arrival;
 	const TrackChain *destination;
 	std::vector<const TrackChain *> waypoints;
+	bool destination_changed;
 	std::vector<TrainRouteMetric *> metrics;
-	std::list<Wait> waits;
+	bool metrics_stale;
+	std::list<SequencePoint> sequence_points;
+	unsigned current_sequence;
+	bool sequence_check_pending;
 	Msp::Time::TimeDelta delay;
-
-	bool update_pending;
+	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
 	TrainRouter(Train &);
@@ -58,9 +76,12 @@ public:
 	int get_priority() const { return priority; }
 
 	bool set_route(const Route *);
-	void add_wait(Block &, Train *);
 	const Route *get_route() const;
+	unsigned get_current_sequence() const { return current_sequence; }
+private:
+	void route_changed();
 
+public:
 	void set_destination(const TrackChain &);
 	const TrackChain *get_destination() const { return destination; }
 	bool is_destination(Track &) const;
@@ -79,14 +100,14 @@ public:
 private:
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
-	const Route *get_route_for_block(const Block &) const;
+	void train_rear_advanced(Block &);
 
 	void create_metrics();
 	Route *create_lead_route(Route *, const Route *);
-	bool advance_route(RouteList::iterator &, const Block &);
-	bool is_on_route(const Block &);
+	bool is_valid_for_track(const Route &, Track &) const;
+	bool advance_to_track(RouteList::iterator &, Track &);
 
-	static void create_plans(Layout &);
+	static void start_planning(Layout &);
 };
 
 } // namespace R2C2