X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=99700699c452a21a81ef51bdad8dd25b5cab8e5e;hb=e8d2abb48b5236cc3455a035628292ae7908240e;hp=dbdf293c89b03293761b7273adfd13886c218b58;hpb=54ab7c88976c860ea729e30a175fbc181f0d68cd;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp index dbdf293..9970069 100644 --- a/source/libr2c2/trainrouteplanner.cpp +++ b/source/libr2c2/trainrouteplanner.cpp @@ -1,3 +1,4 @@ +#include #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 &trains = layout.get_trains(); for(map::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 &TrainRoutePlanner::get_routes_for(const Train &train) const +{ + return get_train_info(train).routes; +} + +const list &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::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,37 +127,39 @@ void TrainRoutePlanner::add_steps(const RoutingStep &step) queue.merge(new_steps); } -void TrainRoutePlanner::create_routes(const RoutingStep &goal) +void TrainRoutePlanner::finalize_plan() { for(vector::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; } - map sequenced_tracks; + map 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::const_iterator j=i->trains.begin(); j!=i->trains.end(); ++j) { Track **history = j->info->track_history; if(j->track.track()==history[0]) continue; - Route *route = j->info->routes.front(); - bool start_new_route = route->has_track(*j->track); - if(!start_new_route) + Route *route = 0; + bool start_new_route = true; + if(!j->info->routes.empty()) { - unsigned nls = j->track->get_n_link_slots(); - for(unsigned k=0; (!start_new_route && kinfo->routes.front(); + start_new_route = route->has_track(*j->track); + if(!start_new_route) { - Track *link = j->track->get_link(k); - start_new_route = (link && link!=history[0] && route->has_track(*link)); + unsigned nls = j->track->get_n_link_slots(); + for(unsigned k=0; (!start_new_route && ktrack->get_link(k); + start_new_route = (link && link!=history[0] && route->has_track(*link)); + } } } @@ -101,68 +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) + 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::iterator k = sequenced_tracks.find(j->track.track()); + map::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::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i) - { - for(list::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::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()), @@ -208,6 +248,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf): occupied_tracks(0), state(MOVING), delay(info->router->get_departure_delay()), + duration(info->router->get_trip_duration()), waypoint(info->router->get_n_waypoints() ? 0 : -1), blocked_by(-1) { @@ -244,6 +285,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState back_offset(other.back_offset), state(other.state), delay(other.delay), + duration(other.duration), waypoint(other.waypoint), distance_traveled(other.distance_traveled), remaining_estimate(other.remaining_estimate), @@ -266,6 +308,9 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const { + if(state==ARRIVED && !duration && info->router->get_trip_duration()) + return false; + OccupiedTrack *occ = occupied_tracks; for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next) if(occ->track==&trk) @@ -333,6 +378,9 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt) delay = Time::zero; } + if(duration) + duration = max(duration-secs*Time::sec, Time::zero); + if(state==MOVING) advance(info->speed*secs); else if(state!=ARRIVED) @@ -542,4 +590,16 @@ bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const return cost_estimate