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

diff --git a/source/libr2c2/trainrouter.h b/source/libr2c2/trainrouter.h
index 27307e7..9fab289 100644
--- a/source/libr2c2/trainrouter.h
+++ b/source/libr2c2/trainrouter.h
@@ -40,6 +40,15 @@ public:
 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;
@@ -49,16 +58,16 @@ private:
 	int priority;
 	RouteList routes;
 	RouteList::iterator reserving_route;
-	unsigned arriving;
-	const TrackChain *destination;
+	ArrivalState arrival;
 	std::vector<const TrackChain *> waypoints;
-	bool destination_changed;
+	bool waypoints_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::Time::TimeDelta duration;
 	Msp::RefPtr<TrainRoutePlanner> planner;
 
 public:
@@ -72,18 +81,20 @@ public:
 	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 &);
@@ -93,13 +104,15 @@ public:
 private:
 	void block_reserved(Block &, Train *);
 	void train_advanced(Block &);
+	void train_rear_advanced(Block &);
 
 	void create_metrics();
-	Route *create_lead_route(Route *, const Route *);
-	bool is_valid_for_track(const Route &, Track &) const;
-	bool advance_to_track(RouteList::iterator &, Track &);
+	bool create_lead_route();
+	bool advance_to_track(RouteList::iterator &, const TrackIter &);
 
+	static void get_routers(Layout &, std::vector<TrainRouter *> &);
 	static void start_planning(Layout &);
+	static void apply_plan(Layout &, TrainRoutePlanner &);
 };
 
 } // namespace R2C2