Split vehicle placement code to a separate class

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

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 2a2473732aac1e24cfd0b75fc62256ed8f60bf8e..547415aa965173ad5eeb68fb0966eceb6aff000c 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
+#include "beamgate.h"
 #include "blockallocator.h"
 #include "block.h"
 #include "catalogue.h"
@@ -256,10 +257,17 @@ 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);
+
+       bool first_reserve = (cur_blocks_end==blocks.end());
+       if(first_reserve)
+               --cur_blocks_end;
+
        try
        {
                if(!block->reserve(&train))
                {
+                       if(first_reserve)
+                               cur_blocks_end = blocks.end();
                        blocks.pop_back();
                        return false;
                }
@@ -268,16 +276,25 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
        }
        catch(...)
        {
+               if(first_reserve)
+                       cur_blocks_end = blocks.end();
                blocks.pop_back();
                throw;
        }
 }
 
-void BlockAllocator::advance_front(const Block *block)
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
 {
        BlockList::iterator end;
        if(block)
-               end = find_if(cur_blocks_end, blocks.end(), BlockMatch(*block));
+       {
+               end = cur_blocks_end;
+               if(inclusive)
+                       --end;
+               end = find_if(end, blocks.end(), BlockMatch(*block));
+               if(inclusive && end!=blocks.end())
+                       ++end;
+       }
        else
                end = blocks.end();
 
@@ -291,29 +308,65 @@ void BlockAllocator::advance_front(const Block *block)
 
 void BlockAllocator::advance_front(const Sensor *sensor)
 {
-       advance_front(sensor ? sensor->get_block() : 0);
+       if(sensor)
+               advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+       else
+               advance_front(0, false);
 }
 
 void BlockAllocator::advance_back()
 {
-       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();
+       bool rev = train.get_controller().get_reverse();
+       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();
 
        /* Sensors aren't guaranteed to be detriggered in order.  Go through the
        block list and locate the first sensor that's still active. */
-       Sensor *last_inactive = 0;
-       for(BlockList::iterator i=blocks.begin(); (i!=cur_blocks_end && i->block()!=&veh_block); ++i)
+       BlockList::iterator end = blocks.end();
+       for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
+       {
+               Block *block = &**i;
+               list<Sensor *> sensors;
+
+               /* Collect all sensors from the block in the order they are expected to
+               detrigger. */
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                               sensors.push_back(gate);
+                       }
+
                if(Sensor *sensor = (*i)->get_sensor())
+                       sensors.push_back(sensor);
+
+               /* See if any sensor is still active, and record the position of the
+               last inactive sensor. */
+               bool active_sensor = false;
+               for(list<Sensor *>::const_iterator j=sensors.begin(); (!active_sensor && j!=sensors.end()); ++j)
+               {
+                       if((*j)->get_state())
+                               active_sensor = true;
+                       else
+                               end = i;
+               }
+
+               // Stop if we encounter an active sensor or the train's last vehicle
+               if(block==&veh_block || active_sensor)
                {
-                       if(sensor->get_state())
+                       if(end!=blocks.end())
                        {
-                               if(last_inactive)
-                                       release_blocks_begin(i);
-                               return;
+                               /* If the last inactive sensor was in an earlier block, release
+                               that block as well. */
+                               if(i!=end)
+                                       ++end;
+                               release_blocks_begin(end);
                        }
-                       else
-                               last_inactive = sensor;
+                       return;
                }
+       }
 }
 
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
@@ -370,7 +423,7 @@ void BlockAllocator::reverse()
 
 void BlockAllocator::turnout_path_changing(Track &track)
 {
-       BlockList::iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(track.get_block()));
+       BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(track.get_block()));
        if(i!=blocks.end())
        {
                ++i;
@@ -416,17 +469,48 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
 void BlockAllocator::update_next_sensor(Sensor *after)
 {
+       BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
        BlockList::iterator i = cur_blocks_end;
        if(after)
+       {
+               if(after_gate)
+                       --i;
                i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+       }
 
        for(; i!=blocks.end(); ++i)
+       {
                if(Sensor *sensor = (*i)->get_sensor())
-                       if(sensor!=next_sensor)
+               {
+                       if(!after_gate && sensor!=next_sensor)
                        {
                                next_sensor = sensor;
                                return;
                        }
+               }
+
+               Block *block = &**i;
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                       {
+                                               if(after_gate)
+                                               {
+                                                       if(gate==after_gate)
+                                                               after_gate = 0;
+                                               }
+                                               else
+                                               {
+                                                       next_sensor = gate;
+                                                       return;
+                                               }
+                                       }
+                       }
+       }
 
        next_sensor = 0;
 }