#include <list>
#include <msp/datafile/objectloader.h>
-#include "block.h"
#include "blockiter.h"
+#include "sensor.h"
namespace R2C2 {
public:
BlockAllocator(Train &);
- void start_from(Block &, unsigned);
+ void start_from(const BlockIter &);
void clear();
bool empty() const { return blocks.empty(); }
void stop_at(const Block *);
const BlockIter &first() const;
const BlockIter &last() const;
const BlockIter &last_current() const;
+ const BlockIter &iter_for(const Block &) const;
- int get_entry_to_block(const Block &) const;
+ bool has_block(const Block &) const;
+ bool is_block_current(const Block &) const;
+private:
+ BlockList::const_iterator find_block(const BlockList::const_iterator &, const BlockList::const_iterator &, const Block &) const;
+public:
void reserve_more();
- void release_until(const Block &);
+private:
+ bool reserve_block(const BlockIter &);
+public:
bool release_from(const Block &);
void release_noncurrent();
private:
- void release_blocks(const BlockList::iterator &, const BlockList::iterator &);
+ void release_blocks_begin(const BlockList::iterator &);
+ void release_blocks_end(const BlockList::iterator &);
+ void release_block(const BlockList::iterator &);
public:
void reverse();
private:
void turnout_path_changed(Track &);
void block_reserved(Block &, const Train *);
- void block_state_changed(Block &, Block::State);
+ void sensor_state_changed(Sensor &, Sensor::State);
public:
void save(std::list<Msp::DataFile::Statement> &) const;