X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=13b2970883535f99a9869939f83e32ab81ace7e0;hb=462a04be004ab4b0ff3ce14c51a19b50271b17c7;hp=d1cb6ff4a3a9b8eca35c439edcf8db3258e6e17b;hpb=2fec8b40d8cd953e36362773e440e50cc4f94a91;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index d1cb6ff..13b2970 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -40,30 +40,12 @@ void TrainRouter::set_priority(int p)
 
 bool TrainRouter::set_route(const Route *r)
 {
-	BlockIter fncb = train.get_first_noncritical_block();
-
-	Route *lead = 0;
-	if(r && train.is_placed())
-	{
-		const BlockAllocator &allocator = train.get_block_allocator();
-		TrackIter first = allocator.first().track_iter();
-		TrackIter next = fncb.track_iter();
-		if(!r->has_track(*next))
-		{
-			lead = Route::find(next, *r);
-			if(!lead)
-				return false;
-			create_lead_route(lead, lead);
-		}
-		else if(!r->has_track(*first))
-			lead = create_lead_route(0, r);
-	}
-
 	routes.clear();
-	if(lead)
-		routes.push_back(lead);
 	if(r)
+	{
 		routes.push_back(r);
+		create_lead_route();
+	}
 
 	destination = 0;
 	waypoints.clear();
@@ -136,14 +118,6 @@ void TrainRouter::set_destination(const TrackChain &d)
 	metrics_stale = true;
 }
 
-bool TrainRouter::is_destination(Track &track) const
-{
-	if(destination)
-		return destination->has_track(track);
-	else
-		return false;
-}
-
 void TrainRouter::add_waypoint(const TrackChain &wp)
 {
 	waypoints.push_back(&wp);
@@ -151,12 +125,12 @@ void TrainRouter::add_waypoint(const TrackChain &wp)
 	metrics_stale = true;
 }
 
-bool TrainRouter::is_waypoint(unsigned index, Track &track) const
+const TrackChain &TrainRouter::get_waypoint(unsigned index) const
 {
 	if(index>=waypoints.size())
 		throw out_of_range("TrainRouter::is_waypoint");
 
-	return waypoints[index]->has_track(track);
+	return *waypoints[index];
 }
 
 const TrainRouteMetric &TrainRouter::get_metric(int index) const
@@ -180,6 +154,11 @@ void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
 	destination_changed = true;
 }
 
+void TrainRouter::set_trip_duration(const Time::TimeDelta &d)
+{
+	duration = d;
+}
+
 void TrainRouter::message(const Message &msg)
 {
 	if(msg.type=="set-route")
@@ -207,6 +186,8 @@ void TrainRouter::message(const Message &msg)
 	}
 	else if(msg.type=="set-departure-delay")
 		set_departure_delay(msg.value.value<Time::TimeDelta>());
+	else if(msg.type=="set-trip-duration")
+		set_trip_duration(msg.value.value<Time::TimeDelta>());
 }
 
 void TrainRouter::tick(const Time::TimeDelta &dt)
@@ -214,31 +195,36 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 	if(delay)
 	{
 		delay -= dt;
-		if(delay<=Time::zero)
+		if(delay<Time::zero)
+		{
+			duration = max(duration+delay, Time::zero);
 			delay = Time::zero;
+		}
 	}
+	else if(duration)
+		duration = max(duration-dt, Time::zero);
 
-	if(destination_changed)
+	if(destination_changed && !planner)
+		start_planning(train.get_layout());
+
+	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
 	{
-		if(!planner)
-			start_planning(train.get_layout());
-		else if(planner->get_result()!=TrainRoutePlanner::PENDING)
+		destination_changed = false;
+		if(planner->get_result()==TrainRoutePlanner::COMPLETE)
 		{
-			destination_changed = false;
-			if(planner->get_result()==TrainRoutePlanner::COMPLETE)
-			{
-				const list<Route *> &planned_routes = planner->get_routes_for(train);
-				routes.clear();
-				routes.push_back(create_lead_route(0, planned_routes.front()));
-				routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
-				sequence_points = planner->get_sequence_for(train);
-				current_sequence = 0;
-				sequence_check_pending = false;
-
-				route_changed();
-			}
-			planner = 0;
+			const list<Route *> &planned_routes = planner->get_routes_for(train);
+
+			routes.clear();
+			routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
+			create_lead_route();
+
+			sequence_points = planner->get_sequence_for(train);
+			current_sequence = 0;
+			sequence_check_pending = false;
+
+			route_changed();
 		}
+		planner = 0;
 	}
 
 	if(sequence_check_pending)
@@ -413,33 +399,49 @@ void TrainRouter::create_metrics()
 
 	for(unsigned i=metrics.size(); --i>0; )
 		metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
+
+	metrics_stale = false;
 }
 
-Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
+bool TrainRouter::create_lead_route()
 {
-	if(!lead)
+	if(routes.empty() || !train.is_placed())
+		return false;
+
+	BlockIter fncb = train.get_first_noncritical_block();
+	TrackIter next_track = fncb.track_iter();
+	if(!routes.front()->has_track(*next_track.flip()))
 	{
-		lead = new Route(train.get_layout());
-		lead->set_name("Lead");
-		lead->set_temporary(true);
+		Route *pf = Route::find(next_track, *routes.front());
+		if(!pf)
+			return false;
+
+		routes.push_front(pf);
 	}
 
-	bool target_reached = false;
-	for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
+	TrackIter first_track = train.get_block_allocator().first().track_iter();
+	if(!routes.front()->has_track(*first_track))
 	{
-		if(i->get_block().get_train()!=&train)
-			break;
-		if(target)
+		Route *lead = new Route(train.get_layout());
+		lead->set_name("Lead");
+		lead->set_temporary(true);
+
+		unsigned target_tracks = 0;
+		for(TrackIter i=first_track; (target_tracks<2 && i); i=i.next())
 		{
-			if(target->has_track(*i))
-				target_reached = true;
-			else if(target_reached)
+			if(i->get_block().get_train()!=&train)
 				break;
+			if(routes.front()->has_track(*i))
+				++target_tracks;
+			else if(target_tracks>0)
+				break;
+			lead->add_track(*i);
 		}
-		lead->add_track(*i);
+
+		routes.push_front(lead);
 	}
 
-	return lead;
+	return true;
 }
 
 bool TrainRouter::is_valid_for_track(const Route &route, Track &track) const
@@ -467,21 +469,22 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, Track &track)
 
 void TrainRouter::start_planning(Layout &layout)
 {
-	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
-
+	vector<TrainRouter *> routers;
 	const map<unsigned, Train *> &trains = layout.get_trains();
+	routers.reserve(trains.size());
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
-		{
-			if(router->metrics_stale)
-			{
-				router->create_metrics();
-				router->metrics_stale = false;
-			}
-			router->planner = planner;
-		}
+			routers.push_back(router);
+
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		if((*i)->metrics_stale)
+			(*i)->create_metrics();
+
+	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		(*i)->planner = planner;
 
-	planner->plan();
+	planner->plan_async();
 }