X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=709140c9a6102e3dcb61a94ffc130894dfb10baf;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=81f0e2a9e86c700a92486fcdce88159fd8966da1;hpb=90f9efba8d88f41c7a180734b7bcbdd1501d995e;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 81f0e2a..709140c 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -1,25 +1,20 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_TRAIN_H_
 #define LIBR2C2_TRAIN_H_
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
 #include "blockiter.h"
 #include "controller.h"
+#include "trainai.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
 class Route;
-class Timetable;
+class SpeedQuantizer;
 class Vehicle;
 class VehicleType;
 class Zone;
@@ -27,7 +22,7 @@ class Zone;
 class Train: public sigc::trackable
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Train>
+	class Loader: public Msp::DataFile::ObjectLoader<Train>
 	{
 	private:
 		Block *prev_block;
@@ -40,7 +35,7 @@ public:
 		void block(unsigned);
 		void block_hint(unsigned);
 		void name(const std::string &);
-		void real_speed(unsigned, float, float);
+		void quantized_speed();
 		void route(const std::string &);
 		void timetable();
 		void vehicle(ArticleNumber);
@@ -49,28 +44,13 @@ public:
 	sigc::signal<void, const std::string &> signal_name_changed;
 	sigc::signal<void, const std::string &, float> signal_control_changed;
 	sigc::signal<void, unsigned, bool> signal_function_changed;
+	sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
 	sigc::signal<void, const Route *> signal_route_changed;
+	sigc::signal<void, Block &> signal_advanced;
 	sigc::signal<void> signal_arrived;
 	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-	struct RouteRef
-	{
-		const Route *route;
-		unsigned diversion;
-
-		RouteRef(const Route *, unsigned = 0);
-	};
-
-	struct RealSpeed
-	{
-		float speed;
-		float weight;
-
-		RealSpeed();
-		void add(float, float);
-	};
-
 	typedef std::list<BlockIter> BlockList;
 
 	Layout &layout;
@@ -89,21 +69,20 @@ private:
 	bool reserving;
 	bool advancing;
 	Controller *controller;
-	Timetable *timetable;
+	std::list<TrainAI *> ais;
 	bool active;
 	unsigned current_speed_step;
 	bool speed_changing;
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
-	std::list<RouteRef> routes;
+	std::list<const Route *> routes;
 	bool end_of_route;
-	std::string status;
 
 	Msp::Time::TimeStamp last_entry_time;
 	float travel_dist;
 	bool pure_speed;
-	std::vector<RealSpeed> real_speed;
+	SpeedQuantizer *speed_quantizer;
 	bool accurate_position;
 	float overshoot_dist;
 
@@ -134,28 +113,29 @@ public:
 	void set_function(unsigned, bool);
 	float get_control(const std::string &) const;
 	float get_speed() const;
+	float get_quantized_speed() const;
+	unsigned get_speed_step() const { return current_speed_step; }
 	bool is_active() const { return active; }
 	bool get_function(unsigned) const;
 	unsigned get_functions() const { return functions; }
 
-	void set_timetable(Timetable *);
-	Timetable *get_timetable() { return timetable; }
+	void add_ai(TrainAI &);
+	void remove_ai(TrainAI &);
+	TrainAI *get_tagged_ai(const std::string &) const;
+	void ai_message(const TrainAI::Message &);
 
 	bool set_route(const Route *);
 	bool go_to(Track &);
 	bool go_to(const Zone &);
-	bool divert(Track &);
 	const Route *get_route() const;
 	void place(Block &, unsigned);
 	void unplace();
 	bool is_placed() const { return !blocks.empty(); }
 	bool free_block(Block &);
 	void free_noncritical_blocks();
-	int get_entry_to_block(Block &) const;
+	int get_entry_to_block(const Block &) const;
 	float get_reserved_distance() const;
 
-	const std::string &get_status() const { return status; }
-
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 
 	void save(std::list<Msp::DataFile::Statement> &) const;
@@ -163,23 +143,18 @@ private:
 	void control_changed(const Controller::Control &);
 	void loco_speed_event(unsigned, unsigned, bool);
 	void loco_func_event(unsigned, unsigned, bool);
-	void sensor_event(unsigned, bool);
+	void block_state_changed(Block &, Block::State);
 	void turnout_path_changed(Track &);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
 	void reserve_more();
 	void check_turnout_paths(bool);
 	float get_reserved_distance_until(const Block *, bool) const;
-	float get_real_speed(unsigned) const;
-	unsigned find_speed_step(float) const;
-	float get_travel_speed() const;
-	void set_status(const std::string &);
 	void release_blocks();
 	void release_blocks(BlockList::iterator, BlockList::iterator);
 	void reverse_blocks(BlockList &) const;
-	bool advance_route(std::list<RouteRef>::iterator &, Track &);
+	bool advance_route(std::list<const Route *>::iterator &, Track &);
 	Route *create_lead_route(Route *, const Route *);
-	bool is_valid_diversion(const Route &, const TrackIter &);
 };
 
 } // namespace R2C2