X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=b38b62d6d1f1cd37763fcb2c3979dff8d4e97439;hb=57e0944ee8ed442e2d0aa7c9964cac00450af5e7;hp=acb59aeae808beab4a212b245435bf7f9c181c93;hpb=59bae8acd679127602cf35d22bcd37e316a5a056;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index acb59ae..b38b62d 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -15,6 +15,16 @@ using namespace Msp;
 
 namespace R2C2 {
 
+struct BlockAllocator::BlockMatch
+{
+	const Block █
+
+	BlockMatch(const Block &b): block(b) { }
+
+	bool operator()(const BlockIter &bi) const { return &*bi==█ }
+};
+
+
 BlockAllocator::BlockAllocator(Train &t):
 	train(t),
 	cur_blocks_end(blocks.end()),
@@ -26,10 +36,25 @@ BlockAllocator::BlockAllocator(Train &t):
 	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));
 
-	const set<Track *> &tracks = layout.get_tracks();
+	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())
+		{
+			(*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)
@@ -41,8 +66,22 @@ void BlockAllocator::start_from(const BlockIter &block)
 	reserve_block(block);
 }
 
+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()
 {
+	active = false;
 	release_blocks_begin(blocks.end());
 	pending_block = 0;
 	stop_at_block = 0;
@@ -51,6 +90,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 +123,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 +131,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()
@@ -229,29 +264,6 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 }
 
-bool BlockAllocator::release_from(const Block &block)
-{
-	bool have_sensor = false;
-	for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
-	{
-		if(i->block()==&block)
-		{
-			if(have_sensor)
-				release_blocks_end(i);
-			return have_sensor;
-		}
-		else if((*i)->get_sensor_id())
-			have_sensor = true;
-	}
-
-	return false;
-}
-
-void BlockAllocator::release_noncurrent()
-{
-	release_blocks_end(cur_blocks_end);
-}
-
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
 {
 	for(BlockList::iterator i=blocks.begin(); i!=end; )
@@ -264,10 +276,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--);
@@ -288,10 +303,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(blocks.begin(), 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)
@@ -344,6 +373,9 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
 			for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
 				train.signal_advanced.emit(**j);
 			cur_blocks_end = end;
+
+			if(active)
+				reserve_more();
 		}
 		else if(result==3)
 			train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");