X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=47a409cd7cb2bdb36064f753e5c2f9cadd4bca77;hb=0ac334781fcb5029e4ea9236a8e93f43169eb7f2;hp=07afe2b722112bb4453b4b994ad7b517fff207f1;hpb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 07afe2b..47a409c 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -9,9 +9,10 @@ namespace R2C2 {
 
 class Block;
 class Layout;
-class Route;
 class Track;
-class Zone;
+class TrackChain;
+class TrainRouteMetric;
+class TrainRoutePlanner;
 
 class TrainRouter: public TrainAI
 {
@@ -25,45 +26,64 @@ public:
 	};
 
 	sigc::signal<void, const Route *> signal_route_changed;
-	sigc::signal<void> signal_arrived;
+	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;
+
+		SequencePoint(Block &, unsigned);
 
-		Wait();
+		bool is_cleared() const;
 	};
 
+private:
 	typedef std::list<const Route *> RouteList;
 
 	int priority;
 	RouteList routes;
-	bool arriving;
-	const Zone *dest_zone;
-	const Block *dest_block;
-	std::list<Wait> waits;
-
-	bool update_pending;
+	unsigned arriving;
+	const TrackChain *destination;
+	std::vector<const TrackChain *> waypoints;
+	bool destination_changed;
+	std::vector<TrainRouteMetric *> metrics;
+	bool metrics_stale;
+	std::list<SequencePoint> sequence_points;
+	unsigned current_sequence;
+	bool sequence_check_pending;
+	Msp::Time::TimeDelta delay;
+	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
 	TrainRouter(Train &);
+	~TrainRouter();
 
 	void set_priority(int);
 	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();
 
-	void set_destination(const Zone &);
-	void set_destination(const Block &);
-	bool has_destination() const;
+public:
+	void set_destination(const TrackChain &);
+	const TrackChain *get_destination() const { return destination; }
 	bool is_destination(Track &) const;
+	void add_waypoint(const TrackChain &);
+	unsigned get_n_waypoints() const { return waypoints.size(); }
+	bool is_waypoint(unsigned, Track &) const;
+	const TrainRouteMetric &get_metric(int = -1) const;
+	void set_departure_delay(const Msp::Time::TimeDelta &);
+	const Msp::Time::TimeDelta &get_departure_delay() const { return delay; }
 
 	virtual void message(const Message &);
-	virtual void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+	virtual void tick(const Msp::Time::TimeDelta &);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
 
@@ -72,11 +92,12 @@ private:
 	void train_advanced(Block &);
 	const Route *get_route_for_block(const Block &) const;
 
+	void create_metrics();
 	Route *create_lead_route(Route *, const Route *);
 	bool advance_route(RouteList::iterator &, const Block &);
 	bool is_on_route(const Block &);
 
-	static void create_plans(Layout &);
+	static void start_planning(Layout &);
 };
 
 } // namespace R2C2