X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.h;h=9fab2892efe15803da1f413277f7a6bd25678122;hb=83c6923396fcfa42e6adf949b9476663f322748b;hp=c1b6977f3734d45b19f615146c899d0ef22dedc0;hpb=b68d1d4f2be93a405170e7caca05760ca473dcc6;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index c1b6977..9fab289 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,50 @@ 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,
+		WAITING_FOR_SEQUENCE,
+		RESERVED_TO_END,
+		ADVANCED_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;
-	const TrackChain *destination;
+	RouteList::iterator reserving_route;
+	ArrivalState arrival;
 	std::vector<const TrackChain *> waypoints;
+	bool waypoints_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::Time::TimeDelta duration;
+	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
 	TrainRouter(Train &);
@@ -58,19 +78,23 @@ public:
 	int get_priority() const { return priority; }
 
 	bool set_route(const Route *);
-	bool add_route(const Route &);
-	void add_wait(Block &, Train *);
 	const Route *get_route() const;
+	unsigned get_current_sequence() const { return current_sequence; }
+private:
+	void use_planned_route();
+	void route_changed();
 
+public:
 	void set_destination(const TrackChain &);
-	const TrackChain *get_destination() const { return destination; }
-	bool is_destination(Track &) const;
+	const TrackChain *get_destination() const { return waypoints.empty() ? 0 : waypoints.back(); }
 	void add_waypoint(const TrackChain &);
 	unsigned get_n_waypoints() const { return waypoints.size(); }
-	bool is_waypoint(unsigned, Track &) const;
+	const TrackChain &get_waypoint(unsigned) 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; }
+	void set_trip_duration(const Msp::Time::TimeDelta &);
+	const Msp::Time::TimeDelta &get_trip_duration() const { return duration; }
 
 	virtual void message(const Message &);
 	virtual void tick(const Msp::Time::TimeDelta &);
@@ -80,14 +104,15 @@ 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 create_lead_route();
+	bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
-	static void create_plans(Layout &);
+	static void get_routers(Layout &, std::vector<TrainRouter *> &);
+	static void start_planning(Layout &);
+	static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2