X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=cb6b912de53481552990bb5f76936bf5ee801778;hb=b36f3dc43853c76b4710cb1a7b932a758e1693a1;hp=6e2a11cde0bedf77295b089f97961d8467859c98;hpb=ab3073367fb8e7d7b534b5c5b81a16346ba20717;p=r2c2.git diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp index 6e2a11c..cb6b912 100644 --- a/source/libr2c2/blockallocator.cpp +++ b/source/libr2c2/blockallocator.cpp @@ -34,15 +34,17 @@ BlockAllocator::BlockAllocator(Train &t): pending_block(0), stop_at_block(0), reserving(false), - advancing(false) + advancing(false), + reserve_pending(false) { Layout &layout = train.get_layout(); layout.signal_block_reserved.connect(sigc::mem_fun(this, &BlockAllocator::block_reserved)); layout.signal_sensor_state_changed.connect(sigc::mem_fun(this, &BlockAllocator::sensor_state_changed)); + layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &BlockAllocator::halt_event)); const set &tracks = layout.get_all(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - if((*i)->get_turnout_address()) + 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)))); @@ -58,6 +60,7 @@ void BlockAllocator::set_active(bool a) { release_blocks_end(cur_blocks_end); pending_block = 0; + reserve_pending = false; } } @@ -185,11 +188,23 @@ bool BlockAllocator::is_block_current(const Block &block) const return find_if(blocks.begin(), end, BlockMatch(block))!=cur_blocks_end; } +void BlockAllocator::tick() +{ + if(reserve_pending) + { + reserve_pending = false; + reserve_more(); + } +} + void BlockAllocator::reserve_more() { if(blocks.empty()) throw logic_error("no blocks"); + if(train.get_layout().get_driver().is_halted()) + return; + BlockIter start = blocks.back(); if(&*start==stop_at_block) return; @@ -253,26 +268,16 @@ void BlockAllocator::reserve_more() } 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; + } } } @@ -347,7 +352,7 @@ void BlockAllocator::advance_front(const Block *block, bool inclusive) // 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) @@ -364,6 +369,8 @@ void BlockAllocator::advance_back() const Vehicle &veh = train.get_vehicle(rev ? 0 : train.get_n_vehicles()-1); const Block &veh_block = veh.get_placement().get_position(rev ? VehiclePlacement::FRONT_AXLE : VehiclePlacement::BACK_AXLE)->get_block(); + bool pending_cleared = false; + /* 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(); @@ -397,6 +404,9 @@ void BlockAllocator::advance_back() end = i; } + if(block==pending_block) + pending_cleared = true; + // Stop if we encounter an active sensor or the train's last vehicle if(block==&veh_block || active_sensor) { @@ -407,7 +417,12 @@ void BlockAllocator::advance_back() if(i!=end) ++end; release_blocks_begin(end); + signal_rear_advanced.emit(*last()); } + + if(pending_cleared) + reserve_more(); + return; } } @@ -479,13 +494,13 @@ void BlockAllocator::turnout_path_changing(Track &track) void BlockAllocator::turnout_path_changed(Track &track) { if(&track.get_block()==pending_block && !reserving) - reserve_more(); + reserve_pending = true; } void BlockAllocator::block_reserved(Block &block, const Train *tr) { if(&block==pending_block && !tr && !reserving) - reserve_more(); + reserve_pending = true; } void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state) @@ -498,14 +513,16 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state) { if(&sensor==next_sensor) { + if(is_block_current(*block)) + signal_advanced.emit(*block, &sensor); update_next_sensor(next_sensor); advance_front(next_sensor); if(active) - reserve_more(); + reserve_pending = true; } 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(); @@ -559,6 +576,12 @@ void BlockAllocator::update_next_sensor(Sensor *after) next_sensor = 0; } +void BlockAllocator::halt_event(bool halted) +{ + if(active && !halted) + reserve_more(); +} + void BlockAllocator::save(list &st) const { if(!blocks.empty() && cur_blocks_end!=blocks.begin()) @@ -575,7 +598,7 @@ void BlockAllocator::save(list &st) const st.push_back((DataFile::Statement("hint"), prev->get_id())); - for(BlockList::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) + for(BlockList::const_iterator i=cur_blocks.begin(); (i!=cur_blocks.end() && i->block()!=pending_block); ++i) st.push_back((DataFile::Statement("block"), (*i)->get_id())); } }