X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=88fb12e8145baaf3f4e636311f9664b5a0a86e1d;hb=dfd78df0c79d03404d1f2e70c08b643655455725;hp=2e816775f7dfa7c86683a559e3f1f638e436b33f;hpb=d051af7264ee62d03473f1929414e262e918c30a;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 2e81677..88fb12e 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),
@@ -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))));
@@ -79,7 +80,7 @@ bool BlockAllocator::start_from(const BlockIter &block)
 			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_type().get_path_length(t->get_active_path());
+			remaining_length -= t->get_path_length();
 		if(remaining_length<=0)
 			break;
 	}
@@ -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,6 +329,9 @@ 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.
@@ -501,7 +495,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 +604,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;
 }