Use set_route for the first route

[r2c2.git] / source / libr2c2 / trainrouteplanner.cpp

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index cd79a61c8f947ff64a4533396fc716ca6ff24387..581bd03fa86f9b3786d0989f96e687130f459ac2 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -108,7 +108,13 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal)
        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);
+               {
+                       if(j==i->routes.begin())
+                               i->router->set_route(*j);
+                       else
+                               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())
@@ -203,7 +209,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 +278,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 +318,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 +328,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 +469,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 +503,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