Refactor TrainRoutePlanner so that the same object may be used again

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 581bd03fa86f9b3786d0989f96e687130f459ac2..8126ec5a48270ab65f224cd4f7fb2ee91869e034 100644 (file)
--- 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,8 +117,28 @@ 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)
        {
@@ -115,18 +150,25 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal)
                                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;
-                       }
+               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()),