Resume allocation if a train moves out of its own way

[r2c2.git] / source / libr2c2 / blockallocator.cpp

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 674722bb9d21b6951bd0f8b0405fad8e4ecd4db3..7e992e00f41b65f6aecdc6afd6e89ec03e899bd0 100644 (file)
--- 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),
@@ -41,7 +42,7 @@ BlockAllocator::BlockAllocator(Train &t):
 
        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))));
@@ -206,7 +207,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 +228,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 +253,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 +329,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 +354,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 +389,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 +402,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 +498,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 +507,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();
@@ -610,8 +616,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;
 }