#include <sigc++/signal.h>
#include <sigc++/trackable.h>
-#include <msp/time/timestamp.h>
-#include "block.h"
-#include "blockiter.h"
+#include <msp/datafile/objectloader.h>
+#include <msp/time/timedelta.h>
+#include "blockallocator.h"
#include "controller.h"
+#include "sensor.h"
#include "trainai.h"
namespace R2C2 {
class ArticleNumber;
-class Route;
+class Block;
class SpeedQuantizer;
class Vehicle;
class VehicleType;
-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;
Loader(Train &);
private:
virtual void finish();
- void block(unsigned);
- void block_hint(unsigned);
+ void blocks();
void name(const std::string &);
void quantized_speed();
- void route(const std::string &);
+ void router();
void timetable();
- void vehicle(ArticleNumber);
+ void vehicle(const std::string &);
};
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;
+ sigc::signal<void, Block &> signal_rear_advanced;
+ sigc::signal<void, unsigned, Vehicle &> signal_vehicle_added;
+ sigc::signal<void, unsigned, Vehicle &> signal_vehicle_removed;
private:
- struct RouteRef
- {
- const Route *route;
- unsigned diversion;
-
- RouteRef(const Route *, unsigned = 0);
- };
-
- typedef std::list<BlockIter> BlockList;
-
Layout &layout;
const VehicleType &loco_type;
unsigned address;
std::string protocol;
+ unsigned loco_id;
std::string name;
- int priority;
- const Train *yielding_to;
const Train *preceding_train;
std::vector<Vehicle *> vehicles;
- BlockList blocks;
- BlockList::iterator cur_blocks_end;
- BlockList::iterator clear_blocks_end;
- Block *pending_block;
- bool reserving;
+ BlockAllocator allocator;
bool advancing;
Controller *controller;
std::list<TrainAI *> ais;
- bool active;
unsigned current_speed_step;
bool speed_changing;
bool reverse;
- Msp::Time::TimeStamp stop_timeout;
+ Msp::Time::TimeDelta stop_timeout;
unsigned functions;
- std::list<RouteRef> routes;
- bool end_of_route;
- Msp::Time::TimeStamp last_entry_time;
- float travel_dist;
+ BlockIter last_entry_block;
+ Msp::Time::TimeDelta travel_time;
bool pure_speed;
SpeedQuantizer *speed_quantizer;
bool accurate_position;
const std::string &get_protocol() const { return protocol; }
void set_name(const std::string &);
const std::string &get_name() const { return name; }
- void set_priority(int);
- void yield_to(const Train &);
- int get_priority() const { return priority; }
const Train *get_preceding_train() const { return preceding_train; }
Controller &get_controller() const { return *controller; }
const Vehicle &get_vehicle(unsigned) const;
void set_control(const std::string &, float);
- void set_active(bool);
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; }
+ float get_maximum_speed() const;
bool get_function(unsigned) const;
unsigned get_functions() const { return functions; }
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);
+ template<typename T>
+ T *get_ai_of_type() const
+ {
+ for(std::list<TrainAI *>::const_iterator i=ais.begin(); i!=ais.end(); ++i)
+ if(T *ai = dynamic_cast<T *>(*i))
+ return ai;
+ return 0;
+ }
+
+ bool place(const BlockIter &);
void unplace();
- bool is_placed() const { return !blocks.empty(); }
- bool free_block(Block &);
- void free_noncritical_blocks();
- int get_entry_to_block(Block &) const;
+ bool is_placed() const { return !allocator.empty(); }
+ void stop_at(Block *);
+ bool is_block_critical(const Block &) const;
+ BlockIter get_last_critical_block() const;
+private:
+ BlockIter check_critical_blocks(const Block *) const;
+public:
+ void refresh_blocks_from(Block &);
+ const BlockAllocator &get_block_allocator() const { return allocator; }
float get_reserved_distance() const;
- void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
+ void tick(const Msp::Time::TimeDelta &);
void save(std::list<Msp::DataFile::Statement> &) const;
private:
void control_changed(const Controller::Control &);
void loco_speed_event(unsigned, unsigned, bool);
void loco_func_event(unsigned, unsigned, bool);
- void block_state_changed(Block &, Block::State);
- void turnout_path_changed(Track &);
+ void advanced(Block &, Sensor *);
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;
- void release_blocks();
- void release_blocks(BlockList::iterator, BlockList::iterator);
- void reverse_blocks(BlockList &) const;
- bool advance_route(std::list<RouteRef>::iterator &, Track &);
- Route *create_lead_route(Route *, const Route *);
- bool is_valid_diversion(const Route &, const TrackIter &);
+ float get_reserved_distance_until(const Block *) const;
};
} // namespace R2C2
projects / r2c2.git / blobdiff