X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=79274b77ded54cd6df67fb7e38329e36a2a4b03a;hb=1c1f8e0c2ce41bc6f943b450a510cc6bac7ef2e4;hp=674722bb9d21b6951bd0f8b0405fad8e4ecd4db3;hpb=a5e1363ceac1ab552849640c9021fcda362c4416;p=r2c2.git diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp index 674722b..79274b7 100644 --- a/source/libr2c2/blockallocator.cpp +++ b/source/libr2c2/blockallocator.cpp @@ -28,6 +28,7 @@ struct BlockAllocator::BlockMatch BlockAllocator::BlockAllocator(Train &t): train(t), + active(false), cur_blocks_end(blocks.end()), next_sensor(0), pending_block(0), @@ -38,10 +39,11 @@ BlockAllocator::BlockAllocator(Train &t): 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_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)))); @@ -189,6 +191,9 @@ 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; @@ -206,7 +211,7 @@ void BlockAllocator::reserve_more() 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()); @@ -227,7 +232,7 @@ void BlockAllocator::reserve_more() // 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. */ @@ -252,33 +257,23 @@ 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; + } } } 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()); @@ -338,12 +333,15 @@ void BlockAllocator::advance_front(const Block *block, bool inclusive) 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) @@ -360,6 +358,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(); @@ -393,6 +393,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) { @@ -403,7 +406,12 @@ void BlockAllocator::advance_back() if(i!=end) ++end; release_blocks_begin(end); + signal_rear_advanced.emit(*last()); } + + if(pending_cleared) + reserve_more(); + return; } } @@ -494,6 +502,8 @@ 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); @@ -501,7 +511,7 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state) 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(); @@ -555,6 +565,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()) @@ -610,8 +626,8 @@ void BlockAllocator::Loader::block(unsigned id) 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; }