X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=7cca79f795a61c9cad6ad11eb2689639f4574098;hb=4b9ed4362779040bfde6d5cd400a1fbffc894815;hp=f73697a5b45381f8173b045ce70de1ac0abfd590;hpb=e214fd389b9819eac0379cfb78e0f446e267b839;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index f73697a..7cca79f 100644
--- 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"
@@ -15,35 +16,119 @@ using namespace Msp;
 
 namespace R2C2 {
 
+struct BlockAllocator::BlockMatch
+{
+	const Block &block;
+
+	BlockMatch(const Block &b): block(b) { }
+
+	bool operator()(const BlockIter &bi) const { return &*bi==&block; }
+};
+
+
 BlockAllocator::BlockAllocator(Train &t):
 	train(t),
+	active(false),
 	cur_blocks_end(blocks.end()),
+	next_sensor(0),
 	pending_block(0),
 	stop_at_block(0),
-	reserving(false)
+	reserving(false),
+	advancing(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<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))));
+		}
+}
+
+void BlockAllocator::set_active(bool a)
+{
+	active = a;
+	if(active)
+		reserve_more();
+	else
+	{
+		release_blocks_end(cur_blocks_end);
+		pending_block = 0;
+	}
 }
 
-void BlockAllocator::start_from(const BlockIter &block)
+bool BlockAllocator::start_from(const BlockIter &block)
 {
 	if(!block)
 		throw invalid_argument("BlockAllocator::start_from");
 
+	float remaining_length = 0;
+	unsigned n_vehs = train.get_n_vehicles();
+	for(unsigned i=0; i<n_vehs; ++i)
+		remaining_length += train.get_vehicle(i).get_type().get_length();
+
 	clear();
-	reserve_block(block);
+
+	BlockList blocks_to_reserve;
+	for(BlockIter b=block; b; b=b.next())
+	{
+		if(b->get_train())
+			break;
+		blocks_to_reserve.push_back(b);
+		for(TrackIter t=b.track_iter(); (t && &t->get_block()==&*b); t=t.next())
+			remaining_length -= t->get_path_length();
+		if(remaining_length<=0)
+			break;
+	}
+
+	if(remaining_length>0)
+		return false;
+
+	for(BlockList::iterator i=blocks_to_reserve.begin(); i!=blocks_to_reserve.end(); ++i)
+	{
+		blocks.push_back(*i);
+		try
+		{
+			(*i)->reserve(&train);
+		}
+		catch(...)
+		{
+			blocks.pop_back();
+			while(i!=blocks_to_reserve.begin())
+			{
+				blocks.pop_back();
+				(*--i)->reserve(0);
+			}
+			throw;
+		}
+	}
+
+	return true;
+}
+
+void BlockAllocator::rewind_to(const Block &block)
+{
+	if(!active)
+		return;
+
+	BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(block));
+	if(i!=blocks.end())
+	{
+		release_blocks_end(i);
+		reserve_more();
+	}
 }
 
 void BlockAllocator::clear()
 {
 	release_blocks_begin(blocks.end());
+	active = false;
+	next_sensor = 0;
 	pending_block = 0;
 	stop_at_block = 0;
 }
@@ -51,6 +136,8 @@ void BlockAllocator::clear()
 void BlockAllocator::stop_at(const Block *block)
 {
 	stop_at_block = block;
+	if(active && !block)
+		reserve_more();
 }
 
 const BlockIter &BlockAllocator::first() const
@@ -82,7 +169,7 @@ const BlockIter &BlockAllocator::last_current() const
 
 const BlockIter &BlockAllocator::iter_for(const Block &block) const
 {
-	BlockList::const_iterator i = find_block(blocks.begin(), blocks.end(), block);
+	BlockList::const_iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(block));
 	if(i==blocks.end())
 		throw key_error(&block);
 	return *i;
@@ -90,19 +177,13 @@ const BlockIter &BlockAllocator::iter_for(const Block &block) const
 
 bool BlockAllocator::has_block(const Block &block) const
 {
-	return find_block(blocks.begin(), blocks.end(), block)!=blocks.end();
+	return find_if(blocks.begin(), blocks.end(), BlockMatch(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;
+	BlockList::const_iterator end = cur_blocks_end;
+	return find_if(blocks.begin(), end, BlockMatch(block))!=cur_blocks_end;
 }
 
 void BlockAllocator::reserve_more()
@@ -110,13 +191,16 @@ 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;
 	else if(&*start==pending_block)
 	{
 		TrackIter track = start.track_iter();
-		if(!track.endpoint().has_path(track->get_active_path()))
+		if(track->is_path_changing() || !track.endpoint().has_path(track->get_active_path()))
 			return;
 	}
 
@@ -127,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());
@@ -148,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. */
@@ -157,7 +241,10 @@ void BlockAllocator::reserve_more()
 		}
 
 		if(!reserve_block(block))
+		{
+			pending_block = &*block;
 			break;
+		}
 
 		if(cur_blocks_end==blocks.end())
 			--cur_blocks_end;
@@ -170,41 +257,34 @@ 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());
 	}
 
-	// Make any sensorless blocks at the beginning immediately current
-	while(cur_blocks_end!=blocks.end() && !(*cur_blocks_end)->get_sensor_id())
-		++cur_blocks_end;
+	if(!next_sensor)
+	{
+		update_next_sensor(0);
+		// Immediately advance to just before the next sensor
+		advance_front(next_sensor);
+	}
 }
 
 bool BlockAllocator::reserve_block(const BlockIter &block)
@@ -212,10 +292,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;
 		}
@@ -224,32 +311,110 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 	catch(...)
 	{
+		if(first_reserve)
+			cur_blocks_end = blocks.end();
 		blocks.pop_back();
 		throw;
 	}
 }
 
-bool BlockAllocator::release_from(const Block &block)
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
 {
-	bool have_sensor = false;
-	for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
+	BlockList::iterator end;
+	if(block)
 	{
-		if(i->block()==&block)
-		{
-			if(have_sensor)
-				release_blocks_end(i);
-			return have_sensor;
-		}
-		else if((*i)->get_sensor_id())
-			have_sensor = true;
+		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();
+
+	if(end==blocks.end() && blocks.back().block()==pending_block)
+		--end;
 
-	return false;
+	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)
+		signal_advanced.emit(**i, (*i)->get_sensor());
 }
 
-void BlockAllocator::release_noncurrent()
+void BlockAllocator::advance_front(const Sensor *sensor)
 {
-	release_blocks_end(cur_blocks_end);
+	if(sensor)
+		advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+	else
+		advance_front(0, false);
+}
+
+void BlockAllocator::advance_back()
+{
+	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();
+
+	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();
+	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;
+		}
+
+		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)
+		{
+			if(end!=blocks.end())
+			{
+				/* If the last inactive sensor was in an earlier block, release
+				that block as well. */
+				if(i!=end)
+					++end;
+				release_blocks_begin(end);
+				signal_rear_advanced.emit(*last());
+			}
+
+			if(pending_cleared)
+				reserve_more();
+
+			return;
+		}
+	}
 }
 
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
@@ -264,10 +429,13 @@ void BlockAllocator::release_blocks_end(const BlockList::iterator &begin)
 	if(begin==blocks.begin())
 		return release_blocks_begin(blocks.end());
 
+	if(begin==blocks.end())
+		return;
+
 	/* 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; )
+	for(BlockList::iterator i=--blocks.end(); !done; )
 	{
 		done = (i==begin);
 		release_block(i--);
@@ -276,8 +444,12 @@ void BlockAllocator::release_blocks_end(const BlockList::iterator &begin)
 
 void BlockAllocator::release_block(const BlockList::iterator &i)
 {
+	if(advancing)
+		throw logic_error("cannot release while advancing");
 	if(i==cur_blocks_end)
 		++cur_blocks_end;
+	if(next_sensor && &**i==next_sensor->get_block())
+		next_sensor = 0;
 	if(&**i==pending_block)
 		pending_block = 0;
 
@@ -288,10 +460,24 @@ void BlockAllocator::release_block(const BlockList::iterator &i)
 
 void BlockAllocator::reverse()
 {
-	release_noncurrent();
+	release_blocks_end(cur_blocks_end);
 	blocks.reverse();
 	for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		*i = i->reverse();
+
+	if(active)
+		reserve_more();
+}
+
+void BlockAllocator::turnout_path_changing(Track &track)
+{
+	BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(track.get_block()));
+	if(i!=blocks.end())
+	{
+		++i;
+		release_blocks_end(i);
+		pending_block = &track.get_block();
+	}
 }
 
 void BlockAllocator::turnout_path_changed(Track &track)
@@ -308,74 +494,81 @@ void BlockAllocator::block_reserved(Block &block, const Train *tr)
 
 void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
-	Block *block = 0;
-	if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
-		block = &tc->get_block();
-	else
-		return;
-
-	if(block->get_train()!=&train)
+	Block *block = sensor.get_block();
+	if(!block || block->get_train()!=&train)
 		return;
 
 	if(state==Sensor::MAYBE_ACTIVE)
 	{
-		// Find the first sensor block from our reserved blocks that isn't this sensor
-		BlockList::iterator end;
-		unsigned result = 0;
-		for(end=cur_blocks_end; end!=blocks.end(); ++end)
-			if((*end)->get_sensor_id())
-			{
-				if(&**end!=block)
-				{
-					if(result==0)
-						result = 2;
-					else if(result==1)
-						break;
-				}
-				else if(result==0)
-					result = 1;
-				else if(result==2)
-					result = 3;
-			}
-
-		if(result==1)
+		if(&sensor==next_sensor)
 		{
-			// Move blocks up to the next sensor to our current blocks
-			for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
-				train.signal_advanced.emit(**j);
-			cur_blocks_end = end;
+			if(is_block_current(*block))
+				signal_advanced.emit(*block, &sensor);
+			update_next_sensor(next_sensor);
+			advance_front(next_sensor);
+
+			if(active)
+				reserve_more();
 		}
-		else if(result==3)
-			train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
+		else if(!is_block_current(*block))
+			train.get_layout().emergency(block, "Sensor for "+train.get_name()+" triggered out of order");
 	}
 	else if(state==Sensor::INACTIVE)
+		advance_back();
+}
+
+void BlockAllocator::update_next_sensor(Sensor *after)
+{
+	BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
+	BlockList::iterator i = cur_blocks_end;
+	if(after)
 	{
-		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();
-
-		/* 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)
-		{
-			// Avoid freeing blocks that still hold the train's vehicles
-			if(&**i==&veh_block)
-				break;
+		if(after_gate)
+			--i;
+		i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+	}
 
-			if((*i)->get_sensor_id())
+	for(; i!=blocks.end(); ++i)
+	{
+		if(Sensor *sensor = (*i)->get_sensor())
+		{
+			if(!after_gate && sensor!=next_sensor)
 			{
-				if(driver.get_sensor((*i)->get_sensor_id()))
-					break;
-				else
-					end = i;
+				next_sensor = sensor;
+				return;
 			}
 		}
-		
-		if(end!=blocks.end())
-			// Free blocks up to the last inactive sensor
-			release_blocks_begin(++end);
+
+		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;
+}
+
+void BlockAllocator::halt_event(bool halted)
+{
+	if(active && !halted)
+		reserve_more();
 }
 
 void BlockAllocator::save(list<DataFile::Statement> &st) const
@@ -394,7 +587,7 @@ void BlockAllocator::save(list<DataFile::Statement> &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()));
 	}
 }
@@ -433,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;
 }