]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/trainrouteplanner.cpp
Eliminate the one step delay in adding tracks to routes
[r2c2.git] / source / libr2c2 / trainrouteplanner.cpp
index 8126ec5a48270ab65f224cd4f7fb2ee91869e034..30d9f5e482ee054aa4a5dee7df770abbddd743a7 100644 (file)
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include "catalogue.h"
 #include "layout.h"
 #include "route.h"
@@ -12,7 +13,10 @@ using namespace Msp;
 
 namespace R2C2 {
 
-TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
+TrainRoutePlanner::TrainRoutePlanner(Layout &layout):
+       goal(0),
+       result(PENDING),
+       thread(0)
 {
        const map<unsigned, Train *> &trains = layout.get_trains();
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
@@ -23,38 +27,96 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
        }
 }
 
-void TrainRoutePlanner::plan()
+TrainRoutePlanner::~TrainRoutePlanner()
+{
+       delete thread;
+}
+
+TrainRoutePlanner::Result TrainRoutePlanner::plan()
+{
+       prepare_plan();
+       create_plan();
+       if(result==PENDING)
+               finalize_plan();
+
+       return result;
+}
+
+void TrainRoutePlanner::plan_async()
+{
+       if(thread)
+               throw logic_error("already planning");
+
+       prepare_plan();
+       thread = new PlanningThread(*this);
+}
+
+TrainRoutePlanner::Result TrainRoutePlanner::check()
+{
+       if(result==PENDING && goal)
+       {
+               finalize_plan();
+               delete thread;
+               thread = 0;
+       }
+
+       return result;
+}
+
+const list<Route *> &TrainRoutePlanner::get_routes_for(const Train &train) const
+{
+       return get_train_info(train).routes;
+}
+
+const list<TrainRouter::SequencePoint> &TrainRoutePlanner::get_sequence_for(const Train &train) const
+{
+       return get_train_info(train).sequence;
+}
+
+const TrainRoutePlanner::TrainRoutingInfo &TrainRoutePlanner::get_train_info(const Train &train) const
+{
+       for(vector<TrainRoutingInfo>::const_iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
+               if(i->train==&train)
+                       return *i;
+
+       throw key_error(train.get_name());
+}
+
+const TrainRoutePlanner::RoutingStep &TrainRoutePlanner::get_step()
+{
+       steps.splice(steps.end(), queue, queue.begin());
+       return steps.back();
+}
+
+void TrainRoutePlanner::prepare_plan()
 {
        steps.clear();
        queue.clear();
+       goal = 0;
+       result = PENDING;
 
        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();
+}
 
-       const RoutingStep *goal = 0;
+void TrainRoutePlanner::create_plan()
+{
        while(!queue.empty())
        {
                const RoutingStep &step = get_step();
                if(step.is_goal())
                {
                        goal = &step;
-                       break;
+                       return;
                }
 
                add_steps(step);
        }
 
-       if(goal)
-               create_routes(*goal);
-}
-
-const TrainRoutePlanner::RoutingStep &TrainRoutePlanner::get_step()
-{
-       steps.splice(steps.end(), queue, queue.begin());
-       return steps.back();
+       result = FAILED;
 }
 
 void TrainRoutePlanner::add_steps(const RoutingStep &step)
@@ -65,19 +127,19 @@ void TrainRoutePlanner::add_steps(const RoutingStep &step)
        queue.merge(new_steps);
 }
 
-void TrainRoutePlanner::create_routes(const RoutingStep &goal)
+void TrainRoutePlanner::finalize_plan()
 {
        for(vector<TrainRoutingInfo>::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
        {
                i->routes.clear();
                i->sequence.clear();
-               for(unsigned j=0; j<3; ++j)
+               for(unsigned j=0; j<2; ++j)
                        i->track_history[j] = 0;
        }
 
-       map<Track *, SequencingInfo *> sequenced_tracks;
+       map<Track *, TrainRouter::SequencePoint *> sequenced_tracks;
        unsigned sequence = steps.size();
-       for(const RoutingStep *i=&goal; i; i=i->prev)
+       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;
@@ -106,69 +168,41 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal)
                                route = new Route(j->info->train->get_layout());
                                route->set_name("Router");
                                route->set_temporary(true);
-                               for(unsigned k=2; k>0; --k)
-                                       if(history[k])
-                                               route->add_track(*history[k]);
+                               for(unsigned k=0; (k<2 && history[k]); ++k)
+                                       route->add_track(*history[k]);
                                j->info->routes.push_front(route);
                        }
 
-                       if(history[0])
-                               route->add_track(*history[0]);
-                       for(unsigned k=2; k>0; --k)
-                               history[k] = history[k-1];
+                       route->add_track(*j->track.track());
+                       history[1] = history[0];
                        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());
+                       map<Track *, TrainRouter::SequencePoint *>::iterator k = sequenced_tracks.find(j->track.track());
                        if(k!=sequenced_tracks.end())
                        {
-                               if(!k->second->preceding)
+                               if(!k->second->preceding_train)
                                {
-                                       k->second->preceding = j->info;
+                                       k->second->preceding_train = j->info->train;
                                        k->second->sequence_in = sequence;
                                }
-                               j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+                               j->info->sequence.push_front(TrainRouter::SequencePoint(j->track->get_block(), sequence));
                                if(waitable)
                                        k->second = &j->info->sequence.front();
                                --sequence;
                        }
                        else if(waitable)
                        {
-                               j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+                               j->info->sequence.push_front(TrainRouter::SequencePoint(j->track->get_block(), 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)
-               {
-                       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);
-               }
-       }
+       result = COMPLETE;
 }
 
 
-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()),
@@ -548,4 +582,16 @@ bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const
        return cost_estimate<other.cost_estimate;
 }
 
+
+TrainRoutePlanner::PlanningThread::PlanningThread(TrainRoutePlanner &p):
+       planner(p)
+{
+       launch();
+}
+
+void TrainRoutePlanner::PlanningThread::main()
+{
+       planner.create_plan();
+}
+
 } // namespace R2C2