X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainroutemetric.cpp;h=d3878d4aaec5d3b6dc875ee7b0453e0da82376f4;hb=8c7fc0b79ce88e0295e0e6ea52cb7eb753158d8a;hp=469fc9494715dfea68be9517b7a71f1b783d8b89;hpb=279f10b0dffc4b207b7998ac2761514b80d57780;p=r2c2.git

diff --git a/source/libr2c2/trainroutemetric.cpp b/source/libr2c2/trainroutemetric.cpp
index 469fc94..d3878d4 100644
--- a/source/libr2c2/trainroutemetric.cpp
+++ b/source/libr2c2/trainroutemetric.cpp
@@ -9,22 +9,28 @@ namespace R2C2 {
 
 TrainRouteMetric::TrainRouteMetric(const TrackChain &tc, TrackChain::Direction dir)
 {
-	/* Initialize goals for tracks in the target chain.  We travel outwards from
-	the target in the search phase so the iters appear to point the wrong way. */
-	TrackChain::Direction reverse_dir = (dir==TrackChain::DOWN ? TrackChain::UP : TrackChain::DOWN);
-	const TrackChain::TrackSet &ctracks = tc.get_tracks();
-	for(TrackChain::TrackSet::const_iterator i=ctracks.begin(); i!=ctracks.end(); ++i)
+	vector<TrackIter> ends;
+	if(dir==TrackChain::UNSPECIFIED)
 	{
-		if(dir==TrackChain::UNSPECIFIED)
+		for(unsigned i=0; i<2; ++i)
+			if(TrackIter end = tc.get_end(i))
+				ends.push_back(end);
+	}
+	else if(TrackIter end = tc.get_end(dir))
+		ends.push_back(end);
+
+	/* Initialize goals for the ends of the target chain.  We travel away from
+	the goals in the search phase so the iters appear to point the wrong way. */
+	for(vector<TrackIter>::const_iterator i=ends.begin(); i!=ends.end(); ++i)
+	{
+		const TrackType::Endpoint &ep = i->endpoint();
+		unsigned nls = (*i)->get_n_link_slots();
+		for(unsigned j=0; j<nls; ++j)
 		{
-			unsigned nls = (*i)->get_n_link_slots();
-			for(unsigned j=0; j<nls; ++j)
-				if(Track *link = (*i)->get_link(j))
-					if(!ctracks.count(link))
-						goals.push_back(TrackIter(*i, j));
+			TrackIter iter(i->track(), j);
+			if(ep.has_common_paths(iter.endpoint()))
+				goals.push_back(iter);
 		}
-		else if(TrackIter iter = tc.iter_for(**i, reverse_dir))
-			goals.push_back(iter);
 	}
 
 	list<TrackIter> queue;
@@ -68,6 +74,22 @@ void TrainRouteMetric::chain_to(const TrainRouteMetric &metric)
 		i->base_distance = metric.get_distance_from(*i->track.track(), i->track.entry());
 }
 
+float TrainRouteMetric::get_distance_from(const Track &track) const
+{
+	map<Key, Data>::const_iterator i = tracks.lower_bound(Key(&track, 0));
+	map<Key, Data>::const_iterator j = tracks.upper_bound(Key(&track, 255));
+
+	float result = -1;
+	for(; i!=j; ++i)
+	{
+		float d = i->second.distance+i->second.goal->base_distance;
+		if(result<0 || d<result)
+			result = d;
+	}
+
+	return result;
+}
+
 float TrainRouteMetric::get_distance_from(const Track &track, unsigned exit) const
 {
 	map<Key, Data>::const_iterator i = tracks.find(Key(&track, exit));