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())
+ if((*i)->get_type().is_turnout())
{
(*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))));
float dist = 0;
for(BlockList::const_iterator i=cur_blocks_end; i!=blocks.end(); ++i)
{
- if((*i)->get_sensor_id())
+ if((*i)->get_sensor_address())
++nsens;
if(nsens>0)
dist += (*i)->get_path_length(i->entry());
// The track ends here
break;
- if(block->get_turnout_id() && !prev->get_turnout_id())
+ if(block->get_turnout_address() && !prev->get_turnout_address())
{
/* We are arriving at a turnout. See if we have enough blocks and
distance reserved. */
}
else
{
- const TrackType::Endpoint &entry_ep = track.endpoint();
unsigned path = track->get_active_path();
- if(!entry_ep.has_path(path))
+ if(!track.endpoint().has_path(path))
{
- const TrackType::Endpoint &exit_ep = track.reverse().endpoint();
- if(entry_ep.has_common_paths(exit_ep))
+ path = track->get_type().coerce_path(track.entry(), path);
+ track->set_active_path(path);
+ if(track->is_path_changing())
{
- unsigned mask = entry_ep.paths&exit_ep.paths;
- for(path=0; mask>1; ++path, mask>>=1) ;
-
- track->set_active_path(path);
- if(track->is_path_changing())
- {
- pending_block = &*block;
- break;
- }
- }
- else
- // XXX Do something here
+ pending_block = &*block;
break;
+ }
}
}
if(&*block==stop_at_block)
break;
- if(block->get_sensor_id())
+ if(block->get_sensor_address())
++nsens;
if(nsens>0)
dist += block->get_path_length(block.entry());
else
end = blocks.end();
+ if(end==blocks.end() && blocks.back().block()==pending_block)
+ --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);
+ signal_advanced.emit(**i, (*i)->get_sensor());
}
void BlockAllocator::advance_front(const Sensor *sensor)
if(i!=end)
++end;
release_blocks_begin(end);
+ signal_rear_advanced.emit(*last());
}
return;
}
{
if(&sensor==next_sensor)
{
+ if(is_block_current(*block))
+ signal_advanced.emit(*block, &sensor);
update_next_sensor(next_sensor);
advance_front(next_sensor);
reserve_more();
}
else if(!is_block_current(*block))
- train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
+ train.get_layout().emergency(block, "Sensor for "+train.get_name()+" triggered out of order");
}
else if(state==Sensor::INACTIVE)
advance_back();
obj.blocks.push_back(BlockIter(blk, entry));
blk->reserve(&obj.train);
- if(blk->get_sensor_id())
- obj.train.get_layout().get_driver().set_sensor(blk->get_sensor_id(), true);
+ if(blk->get_sensor_address())
+ obj.train.get_layout().get_driver().set_sensor(blk->get_sensor_address(), true);
prev_block = blk;
}