X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=8126ec5a48270ab65f224cd4f7fb2ee91869e034;hb=df72b71642bbc5b9a4e5010ebca8643fbeea3ca8;hp=cd79a61c8f947ff64a4533396fc716ca6ff24387;hpb=6cfe927c34e7b866818502b39073b74b47666ba7;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index cd79a61..8126ec5 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -21,16 +21,19 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
 		if(info.router && info.router->get_destination())
 			routed_trains.push_back(info);
 	}
+}
+
+void TrainRoutePlanner::plan()
+{
+	steps.clear();
+	queue.clear();
 
 	queue.push_back(RoutingStep());
 	RoutingStep &start = queue.back();
 	for(vector<TrainRoutingInfo>::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
 		start.trains.push_back(TrainRoutingState(*i));
 	start.update_estimate();
-}
 
-void TrainRoutePlanner::plan()
-{
 	const RoutingStep *goal = 0;
 	while(!queue.empty())
 	{
@@ -66,34 +69,46 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal)
 {
 	for(vector<TrainRoutingInfo>::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
 	{
-		Route *route = new Route(i->train->get_layout());
-		route->set_name("Router");
-		route->set_temporary(true);
-		i->routes.push_front(route);
-
+		i->routes.clear();
+		i->sequence.clear();
 		for(unsigned j=0; j<3; ++j)
 			i->track_history[j] = 0;
 	}
 
+	map<Track *, SequencingInfo *> sequenced_tracks;
+	unsigned sequence = steps.size();
 	for(const RoutingStep *i=&goal; i; i=i->prev)
-	{
 		for(vector<TrainRoutingState>::const_iterator j=i->trains.begin(); j!=i->trains.end(); ++j)
 		{
 			Track **history = j->info->track_history;
 			if(j->track.track()==history[0])
 				continue;
 
-			if(j->state==WAITING || j->state==BLOCKED)
-				j->info->waits.push_front(&*j);
+			Route *route = 0;
+			bool start_new_route = true;
+			if(!j->info->routes.empty())
+			{
+				route = j->info->routes.front();
+				start_new_route = route->has_track(*j->track);
+				if(!start_new_route)
+				{
+					unsigned nls = j->track->get_n_link_slots();
+					for(unsigned k=0; (!start_new_route && k<nls); ++k)
+					{
+						Track *link = j->track->get_link(k);
+						start_new_route = (link && link!=history[0] && route->has_track(*link));
+					}
+				}
+			}
 
-			Route *route = j->info->routes.front();
-			if(route->has_track(*j->track))
+			if(start_new_route)
 			{
 				route = new Route(j->info->train->get_layout());
 				route->set_name("Router");
 				route->set_temporary(true);
 				for(unsigned k=2; k>0; --k)
-					route->add_track(*history[k]);
+					if(history[k])
+						route->add_track(*history[k]);
 				j->info->routes.push_front(route);
 			}
 
@@ -102,25 +117,58 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal)
 			for(unsigned k=2; k>0; --k)
 				history[k] = history[k-1];
 			history[0] = j->track.track();
+
+			bool waitable = j->track.endpoint().paths!=j->track->get_type().get_paths();
+			map<Track *, SequencingInfo *>::iterator k = sequenced_tracks.find(j->track.track());
+			if(k!=sequenced_tracks.end())
+			{
+				if(!k->second->preceding)
+				{
+					k->second->preceding = j->info;
+					k->second->sequence_in = sequence;
+				}
+				j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+				if(waitable)
+					k->second = &j->info->sequence.front();
+				--sequence;
+			}
+			else if(waitable)
+			{
+				j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+				sequenced_tracks[j->track.track()] = &j->info->sequence.front();
+				--sequence;
+			}
 		}
-	}
 
 	for(vector<TrainRoutingInfo>::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
 	{
 		for(list<Route *>::iterator j=i->routes.begin(); j!=i->routes.end(); ++j)
-			i->router->add_route(**j);
-		const TrainRoutingState *current_wait = 0;
-		for(list<const TrainRoutingState *>::const_iterator j=i->waits.begin(); j!=i->waits.end(); ++j)
-			if(!current_wait || (*j)->track.track()!=current_wait->track.track())
-			{
-				Block &block = (*j)->track.next()->get_block();
-				i->router->add_wait(block, 0);
-				current_wait = *j;
-			}
+		{
+			if(j==i->routes.begin())
+				i->router->set_route(*j);
+			else
+				i->router->add_route(**j);
+		}
+
+		for(list<SequencingInfo>::iterator j=i->sequence.begin(); j!=i->sequence.end(); ++j)
+		{
+			if(j->preceding && j->preceding!=&*i)
+				i->router->add_sequence_point(j->track->get_block(), *j->preceding->train, j->sequence_in, j->sequence_out);
+			else
+				i->router->add_sequence_point(j->track->get_block(), j->sequence_out);
+		}
 	}
 }
 
 
+TrainRoutePlanner::SequencingInfo::SequencingInfo(Track *t, unsigned o):
+	track(t),
+	preceding(0),
+	sequence_in(0),
+	sequence_out(o)
+{ }
+
+
 TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
 	train(&t),
 	speed(train->get_maximum_speed()),
@@ -203,7 +251,9 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
 	state(other.state),
 	delay(other.delay),
 	waypoint(other.waypoint),
+	distance_traveled(other.distance_traveled),
 	remaining_estimate(other.remaining_estimate),
+	wait_time(other.wait_time),
 	blocked_by(other.blocked_by)
 {
 	++occupied_tracks->refcount;
@@ -270,9 +320,29 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance)
 		--occupied_tracks->n_tracks;
 	}
 
-	remaining_estimate -= (distance/info->speed)*Time::sec;
-	if(remaining_estimate<Time::zero)
-		remaining_estimate = Time::zero;
+	distance_traveled += distance;
+	remaining_estimate -= distance;
+}
+
+void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
+{
+	if(delay>=dt)
+	{
+		delay -= dt;
+		return;
+	}
+
+	float secs = dt/Time::sec;
+	if(delay)
+	{
+		secs -= delay/Time::sec;
+		delay = Time::zero;
+	}
+
+	if(state==MOVING)
+		advance(info->speed*secs);
+	else if(state!=ARRIVED)
+		wait_time += secs*Time::sec;
 }
 
 void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
@@ -290,7 +360,7 @@ void TrainRoutePlanner::TrainRoutingState::update_estimate()
 	TrackIter iter = track.reverse(path);
 	float distance = info->router->get_metric(waypoint).get_distance_from(*iter.track(), iter.entry());
 	distance += track->get_type().get_path_length(path)-offset;
-	remaining_estimate = (distance/info->speed)*Time::sec+delay;
+	remaining_estimate = distance;
 }
 
 
@@ -300,7 +370,7 @@ TrainRoutePlanner::RoutingStep::RoutingStep():
 
 TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p):
 	time(p->time),
-	total_estimate(p->total_estimate),
+	cost_estimate(p->cost_estimate),
 	trains(p->trains),
 	prev(p)
 { }
@@ -441,39 +511,22 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 {
 	time += dt;
 	for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
-	{
-		if(i->delay)
-		{
-			i->delay -= dt;
-			if(i->delay>Time::zero)
-				continue;
-			i->delay = Time::zero;
-		}
-		else if(i->state==MOVING)
-			i->advance(i->info->speed*(dt/Time::sec));
-	}
+		i->advance(dt);
 }
 
 void TrainRoutePlanner::RoutingStep::update_estimate()
 {
+	cost_estimate = Time::zero;
 	for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-	{
-		if(i->remaining_estimate<Time::zero)
-		{
-			total_estimate = i->remaining_estimate;
-			return;
-		}
-
-		Time::TimeDelta t = time+i->remaining_estimate;
-		if(i==trains.begin() || t>total_estimate)
-			total_estimate = t;
-	}
+		if(i->remaining_estimate>=0)
+			cost_estimate += i->wait_time+((i->distance_traveled+i->remaining_estimate)/i->info->speed)*Time::sec;
 }
 
 bool TrainRoutePlanner::RoutingStep::is_viable() const
 {
-	if(total_estimate<Time::zero)
-		return false;
+	for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+		if(i->remaining_estimate<0)
+			return false;
 
 	for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		if(i->state==MOVING)
@@ -492,7 +545,7 @@ bool TrainRoutePlanner::RoutingStep::is_goal() const
 
 bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const
 {
-	return total_estimate<other.total_estimate;
+	return cost_estimate<other.cost_estimate;
 }
 
 } // namespace R2C2