if(!block)
throw invalid_argument("BlockAllocator::start_from");
- release_blocks(blocks.begin(), blocks.end());
-
- blocks.push_back(block);
- if(!block->reserve(&train))
- {
- blocks.pop_back();
- return;
- }
+ clear();
+ reserve_block(block);
}
void BlockAllocator::clear()
{
- release_blocks(blocks.begin(), blocks.end());
+ release_blocks_begin(blocks.end());
pending_block = 0;
stop_at_block = 0;
}
return *--i;
}
-int BlockAllocator::get_entry_to_block(const Block &block) const
+const BlockIter &BlockAllocator::iter_for(const Block &block) const
{
- for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if(i->block()==&block)
- return i->entry();
- return -1;
+ BlockList::const_iterator i = find_block(blocks.begin(), blocks.end(), block);
+ if(i==blocks.end())
+ throw key_error(&block);
+ return *i;
+}
+
+bool BlockAllocator::has_block(const Block &block) const
+{
+ return find_block(blocks.begin(), blocks.end(), block)!=blocks.end();
+}
+
+bool BlockAllocator::is_block_current(const Block &block) const
+{
+ return find_block(blocks.begin(), cur_blocks_end, block)!=cur_blocks_end;
+}
+
+BlockAllocator::BlockList::const_iterator BlockAllocator::find_block(const BlockList::const_iterator &begin, const BlockList::const_iterator &end, const Block &block) const
+{
+ BlockList::const_iterator i;
+ for(i=begin; (i!=end && &**i!=&block); ++i) ;
+ return i;
}
void BlockAllocator::reserve_more()
break;
}
- blocks.push_back(block);
- if(!block->reserve(&train))
- {
- blocks.pop_back();
- pending_block = &*block;
+ if(!reserve_block(block))
break;
- }
if(cur_blocks_end==blocks.end())
--cur_blocks_end;
++cur_blocks_end;
}
+bool BlockAllocator::reserve_block(const BlockIter &block)
+{
+ /* Add it to the list first to present a consistent state in block_reserved
+ signal. */
+ blocks.push_back(block);
+ try
+ {
+ if(!block->reserve(&train))
+ {
+ blocks.pop_back();
+ return false;
+ }
+
+ return true;
+ }
+ catch(...)
+ {
+ blocks.pop_back();
+ throw;
+ }
+}
+
void BlockAllocator::release_until(const Block &block)
{
for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
if(i->block()==&block)
{
if(++i!=cur_blocks_end)
- release_blocks(blocks.begin(), i);
+ release_blocks_begin(i);
return;
}
}
if(i->block()==&block)
{
if(have_sensor)
- release_blocks(i, blocks.end());
+ release_blocks_end(i);
return have_sensor;
}
else if((*i)->get_sensor_id())
void BlockAllocator::release_noncurrent()
{
- release_blocks(cur_blocks_end, blocks.end());
+ release_blocks_end(cur_blocks_end);
}
-void BlockAllocator::release_blocks(const BlockList::iterator &b, const BlockList::iterator &e)
+void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
{
- for(BlockList::iterator i=b; i!=e; )
- {
- if(cur_blocks_end==i)
- cur_blocks_end = e;
+ for(BlockList::iterator i=blocks.begin(); i!=end; )
+ release_block(i++);
+}
- Block &block = **i;
- blocks.erase(i++);
- block.reserve(0);
+void BlockAllocator::release_blocks_end(const BlockList::iterator &begin)
+{
+ // Guard against decrementing blocks.begin()
+ if(begin==blocks.begin())
+ return release_blocks_begin(blocks.end());
+
+ /* Release the blocks in reverse order so that a consistent state is
+ presented in block_reserved signal. */
+ bool done = false;
+ for(BlockList::iterator i=blocks.end(); !done; )
+ {
+ done = (i==begin);
+ release_block(i--);
}
}
+void BlockAllocator::release_block(const BlockList::iterator &i)
+{
+ if(i==cur_blocks_end)
+ ++cur_blocks_end;
+ if(&**i==pending_block)
+ pending_block = 0;
+
+ Block &block = **i;
+ blocks.erase(i);
+ block.reserve(0);
+}
+
void BlockAllocator::reverse()
{
release_noncurrent();
void BlockAllocator::turnout_path_changed(Track &track)
{
- for(list<BlockIter>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving && &**i==pending_block)
- reserve_more();
+ if(&track.get_block()==pending_block && !reserving)
+ reserve_more();
}
void BlockAllocator::block_reserved(Block &block, const Train *tr)
void BlockAllocator::block_state_changed(Block &block, Block::State state)
{
+ if(block.get_train()!=&train)
+ return;
+
if(state==Block::MAYBE_ACTIVE)
{
// Find the first sensor block from our reserved blocks that isn't this sensor
}
else if(state==Block::INACTIVE)
{
- const Vehicle &veh = train.get_controller().get_reverse() ? train.get_vehicle(0) : train.get_vehicle(train.get_n_vehicles()-1);
+ 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();
- // Find the first sensor in our current blocks that's still active
- BlockList::iterator end = blocks.begin();
+ /* 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)
{
- if((*i)->has_track(*veh.get_track()))
+ // Avoid freeing blocks that still hold the train's vehicles
+ if(&**i==&veh_block)
break;
+
if((*i)->get_sensor_id())
{
- if(train.get_layout().get_driver().get_sensor((*i)->get_sensor_id()))
+ if(driver.get_sensor((*i)->get_sensor_id()))
break;
else
- {
end = i;
- ++end;
- }
}
}
- if(end!=blocks.begin() && end!=cur_blocks_end)
+ if(end!=blocks.end())
// Free blocks up to the last inactive sensor
- release_blocks(blocks.begin(), end);
+ release_blocks_begin(++end);
}
}
speed_changing(false),
reverse(false),
functions(0),
- travel_dist(0),
pure_speed(false),
speed_quantizer(0),
accurate_position(false),
set_active(true);
Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
- Track *track = vehicle.get_track();
-
- BlockIter first = allocator.first();
- BlockIter last_current = allocator.last_current();
- bool ok = false;
- for(BlockIter i=first; !ok; i=i.next())
- {
- ok = i->has_track(*track);
- if(i==last_current)
- break;
- }
float d = speed*(dt/Time::sec);
- if(ok)
+ if(allocator.is_block_current(vehicle.get_track()->get_block()))
{
SetFlag setf(advancing);
vehicle.advance(reverse ? -d : d);
void Train::block_state_changed(Block &block, Block::State state)
{
- if(state==Block::MAYBE_ACTIVE)
+ if(block.get_train()==this && state==Block::MAYBE_ACTIVE)
{
- const BlockIter &first = allocator.first();
- const BlockIter &last_cur = allocator.last_current();
- bool valid = false;
- for(BlockIter i=first; !valid; i=i.next())
+ if(last_entry_block)
{
- if(&*i==&block)
- valid = true;
- if(&*i==&*last_cur)
- break;
- }
+ float travel_distance = -1;
+ if(pure_speed && speed_quantizer && current_speed_step>0)
+ travel_distance = 0;
- if(valid)
- {
- // Compute speed and update related state
- float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+ for(BlockIter i=last_entry_block; &*i!=█ i=i.next())
+ {
+ if(i->get_sensor_id())
+ return;
+ if(travel_distance>=0)
+ travel_distance += i->get_path_length(i.entry());
+ }
- if(pure_speed && speed_quantizer && current_speed_step>0 && travel_time_secs>=2)
- speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs);
+ if(travel_distance>0)
+ {
+ float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+
+ if(travel_time_secs>=2)
+ speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs);
+ }
+ }
- travel_dist = 0;
- unsigned entry = allocator.get_entry_to_block(block);
- for(BlockIter i(&block, entry);; i=i.next())
+ last_entry_block = allocator.iter_for(block);
+ last_entry_time = Time::now();
+ pure_speed = true;
+ accurate_position = true;
+ overshoot_dist = 0;
+
+ if(!advancing && vehicles.front()->get_track())
+ {
+ TrackIter track = last_entry_block.track_iter();
+ if(reverse)
{
- travel_dist += i->get_path_length(i.entry());
-
- if(&*i==&block && !advancing && vehicles.front()->get_track())
- {
- TrackIter track = i.track_iter();
- if(reverse)
- {
- track = track.flip();
- vehicles.back()->place(track, 0, Vehicle::BACK_AXLE);
- }
- else
- vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
- }
-
- if(i==last_cur)
- break;
+ track = track.flip();
+ vehicles.back()->place(track, 0, Vehicle::BACK_AXLE);
}
- last_entry_time = Time::now();
- pure_speed = true;
- accurate_position = true;
- overshoot_dist = 0;
+ else
+ vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
}
}
}
return;
}
- BlockIter b_iter(&block, t->get_block_allocator().get_entry_to_block(block));
+ BlockIter b_iter = t->get_block_allocator().iter_for(block);
RouteList::iterator route = routes.begin();
if(advance_route(route, block))
void TrainRouter::train_advanced(Block &block)
{
+ BlockIter b_iter = train.get_block_allocator().iter_for(block);
+
// Check if we've reached the next route
if(routes.size()>1)
{
- unsigned entry = train.get_block_allocator().get_entry_to_block(block);
- Track &track = *block.get_endpoint(entry).track;
const Route &route = **++routes.begin();
- if(route.has_track(track))
+ if(route.has_track(*b_iter.endpoint().track))
{
routes.pop_front();
// XXX Exceptions?
if(!routes.empty())
{
- BlockIter iter(&block, train.get_block_allocator().get_entry_to_block(block));
- iter = iter.next();
- if(iter && !is_on_route(*iter))
+ b_iter = b_iter.next();
+ if(b_iter && !is_on_route(*b_iter))
arriving = true;
}
}
projects / r2c2.git / commitdiff