X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=8f8ee490fe2fa67cf5f33113d2efd0efea03c7c5;hb=93ca5f1774e218c313edd88024f82c80714d8e7c;hp=12c4c26586a89df5ffa1422abf317b314b8e7ae2;hpb=7587f018794f53974409a2aad76a0a421cea2d24;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index 12c4c26..8f8ee49 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -24,7 +24,9 @@ namespace Marklin {
 Train::Train(TrafficManager &tm, Locomotive &l):
 	trfc_mgr(tm),
 	loco(l),
+	pending_block(0),
 	target_speed(0),
+	route(0),
 	status("Unplaced"),
 	travel_dist(0),
 	travel_speed(0),
@@ -137,13 +139,21 @@ bool Train::free_block(Block *block)
 	return false;
 }
 
+int Train::get_entry_to_block(Block *block) const
+{
+	for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+		if(i->block==block)
+			return i->entry;
+	for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+		if(i->block==block)
+			return i->entry;
+	return -1;
+}
+
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 {
 	if(try_reserve && t>try_reserve)
-	{
 		reserve_more();
-		update_speed();
-	}
 
 	if(cur_track)
 	{
@@ -189,7 +199,6 @@ void Train::locomotive_reverse_changed(bool)
 	for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
 		i->entry = i->block->traverse(i->entry);
 	reserve_more();
-	update_speed();
 
 	if(cur_track)
 	{
@@ -240,11 +249,8 @@ void Train::sensor_event(bool state, Sensor *sensor)
 			if(i->block->get_sensor_id()==addr)
 				set_position(i->block->get_endpoints()[i->entry]);
 
-		if(target_speed)
-		{
-			reserve_more();
+		if(target_speed && reserve_more()<2)
 			update_speed();
-		}
 	}
 	else
 	{
@@ -261,7 +267,7 @@ void Train::sensor_event(bool state, Sensor *sensor)
 				break;
 			}
 
-		if(target_speed)
+		if(target_speed && pending_block && addr==pending_block->get_sensor_id())
 			reserve_more();
 	}
 }
@@ -299,9 +305,11 @@ void Train::turnout_path_changed(unsigned, Turnout *turnout)
 				i = rsv_blocks.erase(i);
 			}
 			reserve_more();
-			update_speed();
 			return;
 		}
+
+	if(pending_block && tid==pending_block->get_turnout_id())
+		reserve_more();
 }
 
 unsigned Train::reserve_more()
@@ -314,51 +322,97 @@ unsigned Train::reserve_more()
 	if(!last)
 		return 0;
 
+	pending_block = 0;
+
+	// See how many blocks we already have
 	unsigned nsens = 0;
 	for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
 		if(i->block->get_sensor_id())
 			++nsens;
 
-	bool result = false;
-	while(nsens<2)
+	bool got_more = false;
+	BlockRef *good = last;
+	unsigned good_sens = nsens;
+	while(good_sens<3)
 	{
-		int exit = last->block->traverse(last->entry);
-		if(exit>=0) 
+		// Traverse to the next block
+		unsigned exit = last->block->traverse(last->entry);
+		Block *link = last->block->get_link(exit);
+		if(!link)
+			break;
+
+		int entry = link->get_endpoint_by_link(*last->block);
+		if(!link->reserve(this))
 		{
-			Block *link = last->block->get_link(exit);
-			if(link && link->reserve(this))
+			// If we found another train going in the same direction as us, we can keep the blocks we got
+			int other_entry = link->get_train()->get_entry_to_block(link);
+			if(other_entry==entry || link->traverse(entry)==link->traverse(other_entry))
 			{
-				if(route && link->get_turnout_id())
-				{
-					int path = route->get_turnout(link->get_turnout_id());
-					if(path>=0)
-						trfc_mgr.get_control().get_turnout(link->get_turnout_id()).set_path(path);
-				}
-				rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
-				last = &rsv_blocks.back();
-				if(last->block->get_sensor_id())
-				{
-					++nsens;
-					result = true;
-				}
+				good = last;
+				good_sens = nsens;
 			}
-			else
+			pending_block = link;
+			break;
+		}
+
+		if(link->get_turnout_id())
+		{
+			const Block::Endpoint &ep = link->get_endpoints()[entry];
+			const Endpoint &track_ep = ep.track->get_type().get_endpoints()[ep.track_ep];
+
+			if(track_ep.paths&(track_ep.paths-1))
+			{
+				// We're facing the points - keep the blocks reserved so far
+				good = last;
+				good_sens = nsens;
+			}
+
+			Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
+
+			// Figure out what path we'd like to take on the turnout
+			int path = -1;
+			if(route)
+				path = route->get_turnout(link->get_turnout_id());
+			if(path<0)
+				path = turnout.get_path();
+			if(!((track_ep.paths>>path)&1))
+			{
+				for(unsigned i=0; track_ep.paths>>i; ++i)
+					if((track_ep.paths>>i)&1)
+						path = i;
+			}
+
+			if(path!=turnout.get_path())
+			{
+				// The turnout is set to wrong path - switch and wait for it
+				link->reserve(0);
+				pending_block = link;
+				turnout.set_path(path);
 				break;
+			}
+		}
+
+		rsv_blocks.push_back(BlockRef(link, entry));
+		last = &rsv_blocks.back();
+		if(last->block->get_sensor_id())
+		{
+			++nsens;
+			got_more = true;
 		}
-		else
-			break;
 	}
 
-	while(last && !last->block->get_sensor_id())
+	// Unreserve blocks that were not good
+	while(!rsv_blocks.empty() && last!=good)
 	{
 		last->block->reserve(0);
 		rsv_blocks.erase(--rsv_blocks.end());
 		if(!rsv_blocks.empty())
 			last = &rsv_blocks.back();
-		else
-			last = 0;
 	}
 
+	if(got_more)
+		update_speed();
+
 	return nsens;
 }