]> 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 b4d4afd64c23bd0b43ee0361d410d86ef9245f1f..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)
@@ -21,6 +25,75 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
                if(info.router && info.router->get_destination())
                        routed_trains.push_back(info);
        }
+}
+
+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();
@@ -29,29 +102,21 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout)
        start.update_estimate();
 }
 
-void TrainRoutePlanner::plan()
+void TrainRoutePlanner::create_plan()
 {
-       const RoutingStep *goal = 0;
        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)
@@ -62,62 +127,79 @@ 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)
        {
-               Route *route = new Route(i->train->get_layout());
-               route->set_name("Router");
-               route->set_temporary(true);
-               i->routes.push_front(route);
-
-               for(unsigned j=0; j<3; ++j)
+               i->routes.clear();
+               i->sequence.clear();
+               for(unsigned j=0; j<2; ++j)
                        i->track_history[j] = 0;
        }
 
-       for(const RoutingStep *i=&goal; i; i=i->prev)
-       {
+       map<Track *, TrainRouter::SequencePoint *> 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)
+                               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();
-               }
-       }
 
-       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);
-               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())
+                       bool waitable = j->track.endpoint().paths!=j->track->get_type().get_paths();
+                       map<Track *, TrainRouter::SequencePoint *>::iterator k = sequenced_tracks.find(j->track.track());
+                       if(k!=sequenced_tracks.end())
                        {
-                               Block &block = (*j)->track.next()->get_block();
-                               i->router->add_wait(block, 0);
-                               current_wait = *j;
+                               if(!k->second->preceding_train)
+                               {
+                                       k->second->preceding_train = j->info->train;
+                                       k->second->sequence_in = 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(TrainRouter::SequencePoint(j->track->get_block(), sequence));
+                               sequenced_tracks[j->track.track()] = &j->info->sequence.front();
+                               --sequence;
+                       }
+               }
+
+       result = COMPLETE;
 }
 
 
@@ -203,7 +285,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,6 +354,7 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance)
                --occupied_tracks->n_tracks;
        }
 
+       distance_traveled += distance;
        remaining_estimate -= distance;
 }
 
@@ -290,6 +375,8 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
 
        if(state==MOVING)
                advance(info->speed*secs);
+       else if(state!=ARRIVED)
+               wait_time += secs*Time::sec;
 }
 
 void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
@@ -317,7 +404,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)
 { }
@@ -463,19 +550,14 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 
 void TrainRoutePlanner::RoutingStep::update_estimate()
 {
+       cost_estimate = Time::zero;
        for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-       {
-               Time::TimeDelta t = time+(i->remaining_estimate/i->info->speed)*Time::sec+i->delay;
-               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;
@@ -497,7 +579,19 @@ 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;
+}
+
+
+TrainRoutePlanner::PlanningThread::PlanningThread(TrainRoutePlanner &p):
+       planner(p)
+{
+       launch();
+}
+
+void TrainRoutePlanner::PlanningThread::main()
+{
+       planner.create_plan();
 }
 
 } // namespace R2C2