X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=7ee655a1d435acff22ff55cf3ac19bbd38fa0830;hb=3de7ae761b9a1fd1c1cd40457cc7067f4cf57c36;hp=fc62faaa48ab25d6478e42dc55205cc3f5c92f46;hpb=f305e582aef0dceafd3b7b00bf9374bb69bdf8b0;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp index fc62faa..7ee655a 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,8 @@ using namespace Msp; namespace R2C2 { -TrainRoutePlanner::TrainRoutePlanner(Layout &layout) +TrainRoutePlanner::TrainRoutePlanner(Layout &layout): + result(PENDING) { const map &trains = layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) @@ -21,16 +23,20 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout) if(info.router && info.router->get_destination()) routed_trains.push_back(info); } +} + +void TrainRoutePlanner::plan() +{ + steps.clear(); + queue.clear(); + result = PENDING; queue.push_back(RoutingStep()); RoutingStep &start = queue.back(); for(vector::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()) { @@ -45,7 +51,31 @@ void TrainRoutePlanner::plan() } if(goal) + { create_routes(*goal); + result = COMPLETE; + } + else + result = FAILED; +} + +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() @@ -66,34 +96,46 @@ void TrainRoutePlanner::create_routes(const RoutingStep &goal) { 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); - + i->routes.clear(); + i->sequence.clear(); for(unsigned j=0; j<3; ++j) i->track_history[j] = 0; } + map sequenced_tracks; + unsigned sequence = steps.size(); 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; - 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 && ktrack->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,22 +144,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(); - } - } - for(vector::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i) - { - for(list::iterator j=i->routes.begin(); j!=i->routes.end(); ++j) - i->router->add_route(**j); - const TrainRoutingState *current_wait = 0; - for(list::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::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; + } + } } @@ -203,7 +251,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,9 +320,31 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance) --occupied_tracks->n_tracks; } + distance_traveled += distance; remaining_estimate -= distance; } +void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt) +{ + if(delay>=dt) + { + delay -= dt; + return; + } + + float secs = dt/Time::sec; + if(delay) + { + secs -= delay/Time::sec; + delay = Time::zero; + } + + if(state==MOVING) + advance(info->speed*secs); + else if(state!=ARRIVED) + wait_time += secs*Time::sec; +} + void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path) { float distance = occupied_tracks->path_length-offset; @@ -298,7 +370,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) { } @@ -439,34 +511,19 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt) { time += dt; for(vector::iterator i=trains.begin(); i!=trains.end(); ++i) - { - if(i->delay) - { - i->delay -= dt; - if(i->delay>Time::zero) - continue; - i->delay = Time::zero; - } - else if(i->state==MOVING) - i->advance(i->info->speed*(dt/Time::sec)); - } + i->advance(dt); } void TrainRoutePlanner::RoutingStep::update_estimate() { + cost_estimate = Time::zero; for(vector::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::const_iterator i=trains.begin(); i!=trains.end(); ++i) if(i->remaining_estimate<0) return false; @@ -488,7 +545,7 @@ bool TrainRoutePlanner::RoutingStep::is_goal() const bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const { - return total_estimate