X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.cpp;h=a29469c4fd9b97e32751987e3c42ac6f903b078e;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=f96e295a13a75f1962bfd149ccd59dbac41a3796;hpb=78bc40c2d1a5fcc5715143bd2326716fbb143730;p=r2c2.git

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index f96e295..a29469c 100644
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -1,183 +1,188 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
+#include <algorithm>
 #include "control.h"
 #include "block.h"
+#include "tracktype.h"
 #include "trafficmanager.h"
 #include "turnout.h"
 
-using namespace Msp;
-
-#include <iostream>
 using namespace std;
+using namespace Msp;
 
 namespace Marklin {
 
-Block::Block(TrafficManager &tm, Track *start):
+Block::Block(TrafficManager &tm, Track &start):
 	trfc_mgr(tm),
-	id(next_id++),
-	sensor_id(0),
+	id(0),
+	sensor_id(start.get_sensor_id()),
+	turnout_id(start.get_turnout_id()),
 	train(0)
 {
-	tracks.insert(start);
+	tracks.insert(&start);
 
-	if(start->get_sensor_id())
-	{
-		sensor_id=start->get_sensor_id();
-		const Track::EndpointSeq &eps=start->get_endpoints();
-		for(Track::EndpointSeq::const_iterator i=eps.begin(); i!=eps.end(); ++i)
-			endpoints.push_back(Endpoint(start, &*i));
-	}
-	else
-	{
-		TrackSeq queue;
-		queue.push_back(start);
+	list<Track *> queue;
+	queue.push_back(&start);
 
-		while(!queue.empty())
-		{
-			Track *track=queue.front();
-			queue.erase(queue.begin());
+	while(!queue.empty())
+	{
+		Track *track = queue.front();
+		queue.erase(queue.begin());
 
-			const Track::EndpointSeq &eps=track->get_endpoints();
-			for(Track::EndpointSeq::const_iterator i=eps.begin(); i!=eps.end(); ++i)
-				if(i->link && tracks.count(i->link)==0)
+		const vector<Track *> &links = track->get_links();
+		for(unsigned i=0; i<links.size(); ++i)
+			if(links[i] && !tracks.count(links[i]))
+			{
+				if(links[i]->get_sensor_id()==sensor_id && links[i]->get_turnout_id()==turnout_id)
 				{
-					if(!i->link->get_sensor_id())
-					{
-						queue.push_back(i->link);
-						tracks.insert(i->link);
-					}
-					else
-						endpoints.push_back(Endpoint(track, &*i));
+					queue.push_back(links[i]);
+					tracks.insert(links[i]);
 				}
-		}
+				else
+					endpoints.push_back(Endpoint(track, i));
+			}
 	}
 
-	unsigned n=0;
-	for(EndpointSeq::iterator i=endpoints.begin(); i!=endpoints.end(); ++i, ++n)
+	if(sensor_id)
+		id = 0x1000|sensor_id;
+	else if(turnout_id)
+		id = 0x2000|turnout_id;
+
+	for(unsigned i=0; i<endpoints.size(); ++i)
 	{
-		unsigned route=1<<n;
-		i->routes|=route;
+		unsigned path = 1<<i;
+		endpoints[i].paths |= path;
 		set<Track *> visited;
-		find_routes(i->track, i->track_ep, route, visited);
+		find_paths(*endpoints[i].track, endpoints[i].track_ep, path, visited);
 	}
 }
 
-const Block::Endpoint *Block::get_endpoint_by_link(const Block *other) const
+int Block::get_endpoint_by_link(const Block &other) const
 {
-	for(EndpointSeq::const_iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
-		if(i->link==other)
-			return &*i;
+	for(unsigned i=0; i<endpoints.size(); ++i)
+		if(endpoints[i].link==&other)
+			return i;
 
-	return 0;
+	return -1;
 }
 
-const Block::Endpoint *Block::traverse(const Endpoint *ep) const
+unsigned Block::traverse(unsigned epi, float *len) const
 {
-	Track *track=ep->track;
-	const Track::Endpoint *track_ep=ep->track_ep;
+	if(epi>=endpoints.size())
+		throw InvalidParameterValue("Endpoint index out of range");
+
+	const Endpoint &ep = endpoints[epi];
+	Track *track = ep.track;
+	unsigned track_ep = ep.track_ep;
+
+	if(len)
+		*len = 0;
 
 	while(1)
 	{
-		unsigned cur_route=0;
-		unsigned tid=track->get_turnout_id();
+		unsigned cur_path = 0;
+		unsigned tid = track->get_turnout_id();
 		if(tid)
 		{
-			Turnout *turnout=trfc_mgr.get_control().get_turnout(tid);
-			if(turnout)
-				cur_route=turnout->get_route();
+			Turnout &turnout = trfc_mgr.get_control().get_turnout(tid);
+			cur_path = turnout.get_path();
 		}
 
-		const Track::Endpoint *other_ep=track->traverse(track_ep, cur_route);
-		if(!other_ep)
-			return 0;
+		if(len)
+			*len += track->get_type().get_path_length(cur_path);
 
-		for(EndpointSeq::const_iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
-			if(i->track==track && i->track_ep==other_ep)
-				return &*i;
+		unsigned other_ep = track->traverse(track_ep, cur_path);
+		for(unsigned i=0; i<endpoints.size(); ++i)
+			if(endpoints[i].track==track && endpoints[i].track_ep==static_cast<unsigned>(other_ep))
+				return i;
 
-		track_ep=track->get_endpoint_by_link(other_ep->link);
-		track=other_ep->link;
-
-		if(tracks.count(track)==0)
-			return 0;
+		Track *next = track->get_link(other_ep);
+		if(!tracks.count(next))
+			throw LogicError("Block traversal strayed out of the block");
+		track_ep = next->get_endpoint_by_link(*track);
+		track = next;
 	}
 }
 
 void Block::check_link(Block &other)
 {
-	for(EndpointSeq::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
+	for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
 	{
 		if(i->link)
 			continue;
 
-		for(EndpointSeq::iterator j=other.endpoints.begin(); j!=other.endpoints.end(); ++j)
-			if(j->track==i->track_ep->link && j->track_ep->link==i->track && !j->link)
+		for(vector<Endpoint>::iterator j=other.endpoints.begin(); j!=other.endpoints.end(); ++j)
+			if(j->track==i->track->get_link(i->track_ep) && j->track->get_link(j->track_ep)==i->track && !j->link)
 			{
-				i->link=&other;
-				j->link=this;
+				i->link = &other;
+				j->link = this;
 			}
 	}
+
+	if(!sensor_id && !turnout_id && endpoints.size()==2)
+	{
+		unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
+		unsigned id2 = endpoints[1].link ? endpoints[1].link->get_id() : 1;
+		if(id2<id1)
+			swap(id1, id2);
+		id = (id1<<16)|id2;
+	}
+}
+
+Block *Block::get_link(unsigned epi) const
+{
+	if(epi>=endpoints.size())
+		throw InvalidParameterValue("Endpoint index out of range");
+	return endpoints[epi].link;
 }
 
 bool Block::reserve(const Train *t)
 {
 	if(!t || !train)
 	{
-		train=t;
+		train = t;
+		trfc_mgr.signal_block_reserved.emit(*this, train);
 		return true;
 	}
 	else
 		return false;
 }
 
-void Block::print_debug()
+void Block::find_paths(Track &track, unsigned track_ep, unsigned path, set<Track *> &visited)
 {
-	cout<<"Block "<<id;
-	if((*tracks.begin())->get_sensor_id())
-		cout<<", sensor="<<(*tracks.begin())->get_sensor_id();
-	cout<<'\n';
-	for(EndpointSeq::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
-	{
-		cout<<"  Endpoint, link=";
-		if(i->link)
-			cout<<i->link->id;
-		else
-			cout<<"none";
-		cout<<", routes="<<i->routes<<'\n';
-	}
-}
-
-void Block::find_routes(Track *track, const Track::Endpoint *track_ep, unsigned route, std::set<Marklin::Track *> &visited)
-{
-	visited.insert(track);
+	visited.insert(&track);
 
-	const Track::EndpointSeq &eps=track->get_endpoints();
-	for(Track::EndpointSeq::const_iterator i=eps.begin(); i!=eps.end(); ++i)
+	const vector<Marklin::Endpoint> &eps = track.get_type().get_endpoints();
+	for(unsigned i=0; i<eps.size(); ++i)
 	{
-		if(&*i==track_ep) continue;
-		if(!i->link) continue;
-		if(!(i->routes&track_ep->routes)) continue;
-		if(visited.count(i->link)) continue;
-
-		if(tracks.count(i->link))
-			find_routes(i->link, i->link->get_endpoint_by_link(track), route, visited);
+		if(i==track_ep) continue;
+		Track *link = track.get_link(i);
+		if(!link) continue;
+		if(visited.count(link)) continue;
+		if(!(eps[i].paths&eps[track_ep].paths)) continue;
+
+		if(tracks.count(link))
+			find_paths(*link, link->get_endpoint_by_link(track), path, visited);
 		else
 		{
-			for(EndpointSeq::iterator j=endpoints.begin(); j!=endpoints.end(); ++j)
-				if(j->track==track && j->track_ep==&*i)
-					j->routes|=route;
+			for(vector<Endpoint>::iterator j=endpoints.begin(); j!=endpoints.end(); ++j)
+				if(j->track==&track && j->track_ep==i)
+					j->paths |= path;
 		}
 	}
-
-	visited.erase(--visited.end());
 }
 
-unsigned Block::next_id=1;
-
 
-Block::Endpoint::Endpoint(Track *t, const Track::Endpoint *e):
+Block::Endpoint::Endpoint(Track *t, unsigned e):
 	track(t),
 	track_ep(e),
 	link(0),
-	routes(0)
+	paths(0)
 { }
 
 } // namespace Marklin