BlockAllocator::BlockAllocator(Train &t):
train(t),
cur_blocks_end(blocks.end()),
+ next_sensor(0),
pending_block(0),
stop_at_block(0),
- reserving(false)
+ reserving(false),
+ advancing(false)
{
Layout &layout = train.get_layout();
layout.signal_block_reserved.connect(sigc::mem_fun(this, &BlockAllocator::block_reserved));
const set<Track *> &tracks = layout.get_all<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if((*i)->get_turnout_id())
+ {
+ (*i)->signal_path_changing.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changing), sigc::ref(**i))));
(*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &BlockAllocator::turnout_path_changed), sigc::ref(**i))));
+ }
+}
+
+void BlockAllocator::set_active(bool a)
+{
+ active = a;
+ if(active)
+ reserve_more();
+ else
+ {
+ release_blocks_end(cur_blocks_end);
+ pending_block = 0;
+ }
}
void BlockAllocator::start_from(const BlockIter &block)
reserve_block(block);
}
+void BlockAllocator::rewind_to(const Block &block)
+{
+ if(!active)
+ return;
+
+ BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(block));
+ if(i!=blocks.end())
+ {
+ release_blocks_end(i);
+ reserve_more();
+ }
+}
+
void BlockAllocator::clear()
{
release_blocks_begin(blocks.end());
+ active = false;
+ next_sensor = 0;
pending_block = 0;
stop_at_block = 0;
}
void BlockAllocator::stop_at(const Block *block)
{
stop_at_block = block;
+ if(active && !block)
+ reserve_more();
}
const BlockIter &BlockAllocator::first() const
const BlockIter &BlockAllocator::iter_for(const Block &block) const
{
- BlockList::const_iterator i = find_if(blocks.begin(), blocks.end(), IterBlockMatch(block));
+ BlockList::const_iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(block));
if(i==blocks.end())
throw key_error(&block);
return *i;
bool BlockAllocator::has_block(const Block &block) const
{
- return find_if(blocks.begin(), blocks.end(), IterBlockMatch(block))!=blocks.end();
+ return find_if(blocks.begin(), blocks.end(), BlockMatch(block))!=blocks.end();
}
bool BlockAllocator::is_block_current(const Block &block) const
{
- return find_if(blocks.begin(), cur_blocks_end, IterBlockMatch(block))!=cur_blocks_end;
+ BlockList::const_iterator end = cur_blocks_end;
+ return find_if(blocks.begin(), end, BlockMatch(block))!=cur_blocks_end;
}
void BlockAllocator::reserve_more()
else if(&*start==pending_block)
{
TrackIter track = start.track_iter();
- if(!track.endpoint().has_path(track->get_active_path()))
+ if(track->is_path_changing() || !track.endpoint().has_path(track->get_active_path()))
return;
}
}
if(!reserve_block(block))
+ {
+ pending_block = &*block;
break;
+ }
if(cur_blocks_end==blocks.end())
--cur_blocks_end;
dist += block->get_path_length(block.entry());
}
- // Make any sensorless blocks at the beginning immediately current
- while(cur_blocks_end!=blocks.end() && !(*cur_blocks_end)->get_sensor_id())
- ++cur_blocks_end;
+ if(!next_sensor)
+ {
+ update_next_sensor(0);
+ // Immediately advance to just before the next sensor
+ advance_to(next_sensor ? next_sensor->get_block() : 0);
+ }
}
bool BlockAllocator::reserve_block(const BlockIter &block)
}
}
-bool BlockAllocator::release_from(const Block &block)
-{
- bool have_sensor = false;
- for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
- {
- if(i->block()==&block)
- {
- if(have_sensor)
- release_blocks_end(i);
- return have_sensor;
- }
- else if((*i)->get_sensor_id())
- have_sensor = true;
- }
-
- return false;
-}
-
-void BlockAllocator::release_noncurrent()
+void BlockAllocator::advance_to(const Block *block)
{
- release_blocks_end(cur_blocks_end);
+ BlockList::iterator end;
+ if(block)
+ end = find_if(cur_blocks_end, blocks.end(), BlockMatch(*block));
+ else
+ end = blocks.end();
+
+ SetFlag setf(advancing);
+ BlockList::iterator i = cur_blocks_end;
+ // Update cur_blocks_end first to keep things consistent.
+ cur_blocks_end = end;
+ for(; i!=end; ++i)
+ train.signal_advanced.emit(**i);
}
void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
void BlockAllocator::release_block(const BlockList::iterator &i)
{
+ if(advancing)
+ throw logic_error("cannot release while advancing");
if(i==cur_blocks_end)
++cur_blocks_end;
+ if(next_sensor && &**i==next_sensor->get_block())
+ next_sensor = 0;
if(&**i==pending_block)
pending_block = 0;
void BlockAllocator::reverse()
{
- release_noncurrent();
+ release_blocks_end(cur_blocks_end);
blocks.reverse();
for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
*i = i->reverse();
+
+ if(active)
+ reserve_more();
+}
+
+void BlockAllocator::turnout_path_changing(Track &track)
+{
+ BlockList::iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(track.get_block()));
+ if(i!=blocks.end())
+ {
+ ++i;
+ release_blocks_end(i);
+ pending_block = &track.get_block();
+ }
}
void BlockAllocator::turnout_path_changed(Track &track)
void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
{
- Block *block = 0;
- if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
- block = &tc->get_block();
- else
- return;
-
- if(block->get_train()!=&train)
+ Block *block = sensor.get_block();
+ if(!block || block->get_train()!=&train)
return;
if(state==Sensor::MAYBE_ACTIVE)
{
- // Find the first sensor block from our reserved blocks that isn't this sensor
- BlockList::iterator end;
- unsigned result = 0;
- for(end=cur_blocks_end; end!=blocks.end(); ++end)
- if((*end)->get_sensor_id())
- {
- if(&**end!=block)
- {
- if(result==0)
- result = 2;
- else if(result==1)
- break;
- }
- else if(result==0)
- result = 1;
- else if(result==2)
- result = 3;
- }
-
- if(result==1)
+ if(&sensor==next_sensor)
{
- // Move blocks up to the next sensor to our current blocks
- for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
- train.signal_advanced.emit(**j);
- cur_blocks_end = end;
+ update_next_sensor(next_sensor);
+ advance_to(next_sensor ? next_sensor->get_block() : 0);
+
+ if(active)
+ reserve_more();
}
- else if(result==3)
+ else if(!is_block_current(*block))
train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
}
else if(state==Sensor::INACTIVE)
{
const Vehicle &veh = train.get_vehicle(train.get_controller().get_reverse() ? 0 : train.get_n_vehicles()-1);
const Block &veh_block = veh.get_track()->get_block();
- const Driver &driver = train.get_layout().get_driver();
/* Sensors aren't guaranteed to be detriggered in order. Go through the
block list and locate the first sensor that's still active. */
if(&**i==&veh_block)
break;
- if((*i)->get_sensor_id())
+ if(Sensor *s = (*i)->get_sensor())
{
- if(driver.get_sensor((*i)->get_sensor_id()))
+ if(s->get_state()>=Sensor::MAYBE_INACTIVE)
break;
else
end = i;
}
}
+void BlockAllocator::update_next_sensor(Sensor *after)
+{
+ BlockList::iterator i = cur_blocks_end;
+ if(after)
+ i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+
+ for(; i!=blocks.end(); ++i)
+ if(Sensor *sensor = (*i)->get_sensor())
+ if(sensor!=next_sensor)
+ {
+ next_sensor = sensor;
+ return;
+ }
+
+ next_sensor = 0;
+}
+
void BlockAllocator::save(list<DataFile::Statement> &st) const
{
if(!blocks.empty() && cur_blocks_end!=blocks.begin())
projects / r2c2.git / blobdiff