Maintain a separate list of pending RoutingStates

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index e8b5d90107b59b7dad25a455d0f7d4bc678c2a5b..22ac5400ea4fb050437ccdff14de77dbafc483e9 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -21,36 +21,44 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
                        routed_trains.push_back(info);
        }
 
-       steps.push_back(RoutingStep());
-       RoutingStep &start = steps.back();
+       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;
-       for(list<RoutingStep>::iterator i=steps.begin(); i!=steps.end(); ++i)
+       while(!queue.empty())
        {
-               if(i->is_goal())
+               const RoutingStep &step = get_step();
+               if(step.is_goal())
                {
-                       goal = &*i;
+                       goal = &step;
                        break;
                }
 
-               add_steps(*i);
+               add_steps(step);
        }
 
        if(goal)
                create_routes(*goal);
 }
 
+const TrainRoutePlanner::RoutingStep &TrainRoutePlanner::get_step()
+{
+       steps.splice(steps.end(), queue, queue.begin());
+       return steps.back();
+}
+
 void TrainRoutePlanner::add_steps(const RoutingStep &step)
 {
        list<RoutingStep> new_steps;
        step.create_successors(new_steps);
        new_steps.sort();
-       steps.merge(new_steps);
+       queue.merge(new_steps);
 }
 
 void TrainRoutePlanner::create_routes(const RoutingStep &goal)
@@ -175,7 +183,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
 
 TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 {
-       if(!--occupied_tracks->refcount)
+       if(occupied_tracks && !--occupied_tracks->refcount)
                delete occupied_tracks;
 }
 
@@ -184,7 +192,7 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c
        return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
 }
 
-bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
+bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 {
        OccupiedTrack *occ = occupied_tracks;
        for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next)
@@ -362,7 +370,7 @@ bool TrainRoutePlanner::RoutingStep::check_deadlocks() const
 int TrainRoutePlanner::RoutingStep::get_occupant(Track &track) const
 {
        for(unsigned i=0; i<trains.size(); ++i)
-               if(trains[i].is_occupied(track))
+               if(trains[i].is_occupying(track))
                        return i;
 
        return -1;