#include <msp/core/maputils.h>
#include <msp/core/raii.h>
+#include "beamgate.h"
#include "blockallocator.h"
#include "block.h"
#include "catalogue.h"
BlockAllocator::BlockAllocator(Train &t):
train(t),
cur_blocks_end(blocks.end()),
+ next_sensor(0),
pending_block(0),
stop_at_block(0),
reserving(false),
{
release_blocks_begin(blocks.end());
active = false;
+ next_sensor = 0;
pending_block = 0;
stop_at_block = 0;
}
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_front(next_sensor);
+ }
}
bool BlockAllocator::reserve_block(const BlockIter &block)
}
}
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
+{
+ BlockList::iterator end;
+ if(block)
+ {
+ end = cur_blocks_end;
+ if(inclusive)
+ --end;
+ end = find_if(end, blocks.end(), BlockMatch(*block));
+ if(inclusive && end!=blocks.end())
+ ++end;
+ }
+ 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::advance_front(const Sensor *sensor)
+{
+ if(sensor)
+ advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+ else
+ advance_front(0, false);
+}
+
+void BlockAllocator::advance_back()
+{
+ 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();
+
+ /* Sensors aren't guaranteed to be detriggered in order. Go through the
+ block list and locate the first sensor that's still active. */
+ Sensor *last_inactive = 0;
+ for(BlockList::iterator i=blocks.begin(); (i!=cur_blocks_end && i->block()!=&veh_block); ++i)
+ {
+ list<Sensor *> sensors;
+ if(Sensor *sensor = (*i)->get_sensor())
+ sensors.push_back(sensor);
+
+ Block *block = &**i;
+ for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+ if(!j->get_attachments().empty())
+ {
+ Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+ for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+ if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+ sensors.push_back(gate);
+ }
+
+ for(list<Sensor *>::const_iterator j=sensors.begin(); j!=sensors.end(); ++j)
+ {
+ if((*j)->get_state())
+ {
+ if(last_inactive)
+ {
+ if(dynamic_cast<BeamGate *>(*j))
+ ++i;
+ release_blocks_begin(i);
+ }
+ return;
+ }
+ else
+ last_inactive = *j;
+ }
+ }
+}
+
void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
{
for(BlockList::iterator i=blocks.begin(); i!=end; )
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::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)
{
- /* Advance the train to the new blocks. Update cur_blocks_end first
- to keep things in sync. */
- SetFlag setf(advancing);
- BlockList::iterator i = cur_blocks_end;
- cur_blocks_end = end;
- for(; i!=end; ++i)
- train.signal_advanced.emit(**i);
- advancing = false;
+ update_next_sensor(next_sensor);
+ advance_front(next_sensor);
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)
+ advance_back();
+}
+
+void BlockAllocator::update_next_sensor(Sensor *after)
+{
+ BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
+ BlockList::iterator i = cur_blocks_end;
+ if(after)
{
- 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. */
- BlockList::iterator end = blocks.end();
- for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
- {
- // Avoid freeing blocks that still hold the train's vehicles
- if(&**i==&veh_block)
- break;
+ if(after_gate)
+ --i;
+ i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+ }
- if((*i)->get_sensor_id())
+ for(; i!=blocks.end(); ++i)
+ {
+ if(Sensor *sensor = (*i)->get_sensor())
+ {
+ if(!after_gate && sensor!=next_sensor)
{
- if(driver.get_sensor((*i)->get_sensor_id()))
- break;
- else
- end = i;
+ next_sensor = sensor;
+ return;
}
}
-
- if(end!=blocks.end())
- // Free blocks up to the last inactive sensor
- release_blocks_begin(++end);
+
+ Block *block = &**i;
+ for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+ if(!j->get_attachments().empty())
+ {
+ Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+ for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+ if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+ {
+ if(after_gate)
+ {
+ if(gate==after_gate)
+ after_gate = 0;
+ }
+ else
+ {
+ next_sensor = gate;
+ return;
+ }
+ }
+ }
}
+
+ next_sensor = 0;
}
void BlockAllocator::save(list<DataFile::Statement> &st) const
projects / r2c2.git / blobdiff