X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=69a3bbea55484de54a9d43b584563481f2a98894;hb=5eeb8f5749586b9aae2996d2143e300388d15611;hp=45e83e267fb2b37e8b260630442e4a055089f667;hpb=a1c3c054707fc65d497dd13da59b37a9ddb369cc;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp index 45e83e2..69a3bbe 100644 --- a/source/libr2c2/trainrouteplanner.cpp +++ b/source/libr2c2/trainrouteplanner.cpp @@ -2,6 +2,7 @@ #include "layout.h" #include "route.h" #include "train.h" +#include "trainroutemetric.h" #include "trainrouteplanner.h" #include "trainrouter.h" #include "vehicle.h" @@ -21,77 +22,140 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout) routed_trains.push_back(info); } - steps.push_back(RoutingStep()); - RoutingStep &start = steps.back(); + 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; - for(list::iterator i=steps.begin(); i!=steps.end(); ++i) + while(!queue.empty()) { - if(i->is_goal()) + const RoutingStep &step = get_step(); + if(step.is_goal()) { - goal = &*i; + goal = &step; break; } - add_steps(*i); + add_steps(step); } if(goal) create_routes(*goal); } +const TrainRoutePlanner::RoutingStep &TrainRoutePlanner::get_step() +{ + steps.splice(steps.end(), queue, queue.begin()); + return steps.back(); +} + void TrainRoutePlanner::add_steps(const RoutingStep &step) { list new_steps; step.create_successors(new_steps); new_steps.sort(); - steps.merge(new_steps); + queue.merge(new_steps); } void TrainRoutePlanner::create_routes(const RoutingStep &goal) { for(vector::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i) { - i->route = new Route(i->train->get_layout()); - i->route->set_name("Router"); - i->route->set_temporary(true); + 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->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) { - if(j->state==WAITING || j->state==BLOCKED) - j->info->waits.push_front(&*j); - j->info->route->add_track(*j->track); + Track **history = j->info->track_history; + if(j->track.track()==history[0]) + continue; + + Route *route = j->info->routes.front(); + if(route->has_track(*j->track)) + { + 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]); + 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]; + 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()); + 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::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i) { - i->router->set_route(i->route); - 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()) - { - Block &block = (*j)->track.next()->get_block(); - i->router->add_wait(block, 0); - current_wait = *j; - } + 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); + } } } +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()), - router(train->get_ai_of_type()), - route(0) + router(train->get_ai_of_type()) { // If no maximum speed is specified, use a sensible default if(!speed) @@ -156,6 +220,8 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf): break; iter = iter.next(); } + + update_estimate(); } TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState &other): @@ -168,6 +234,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; @@ -175,7 +244,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState TrainRoutePlanner::TrainRoutingState::~TrainRoutingState() { - if(!--occupied_tracks->refcount) + if(occupied_tracks && !--occupied_tracks->refcount) delete occupied_tracks; } @@ -184,7 +253,7 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay; } -bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const +bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const { OccupiedTrack *occ = occupied_tracks; for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next) @@ -233,6 +302,30 @@ 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) @@ -245,6 +338,14 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path) offset = 0; } +void TrainRoutePlanner::TrainRoutingState::update_estimate() +{ + TrackIter iter = track.reverse(path); + float distance = info->router->get_metric(waypoint).get_distance_from(*iter.track(), iter.entry()); + distance += track->get_type().get_path_length(path)-offset; + remaining_estimate = distance; +} + TrainRoutePlanner::RoutingStep::RoutingStep(): prev(0) @@ -252,6 +353,7 @@ TrainRoutePlanner::RoutingStep::RoutingStep(): TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p): time(p->time), + cost_estimate(p->cost_estimate), trains(p->trains), prev(p) { } @@ -291,6 +393,8 @@ void TrainRoutePlanner::RoutingStep::create_successors(list &new_st if(next_entry_ep.has_path(i)) { train.path = i; + train.update_estimate(); + next.update_estimate(); if(next.is_viable()) new_steps.push_back(next); } @@ -336,17 +440,24 @@ bool TrainRoutePlanner::RoutingStep::update_states() bool TrainRoutePlanner::RoutingStep::check_deadlocks() const { - for(unsigned i=0; i::const_iterator i=trains.begin(); i!=trains.end(); ++i) { - const TrainRoutingState &train = trains[i]; - if(train.state!=BLOCKED) + if(i->state!=BLOCKED) continue; - if(train.blocked_by<0) + if(i->blocked_by<0) return true; - if(trains[train.blocked_by].blocked_by==static_cast(i)) - return true; + int slow = i->blocked_by; + int fast = trains[slow].blocked_by; + while(fast>=0 && trains[fast].blocked_by>=0) + { + if(fast==slow) + return true; + + slow = trains[slow].blocked_by; + fast = trains[trains[fast].blocked_by].blocked_by; + } } return false; @@ -355,7 +466,7 @@ bool TrainRoutePlanner::RoutingStep::check_deadlocks() const int TrainRoutePlanner::RoutingStep::get_occupant(Track &track) const { for(unsigned i=0; i::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) + 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 { + for(vector::const_iterator i=trains.begin(); i!=trains.end(); ++i) + if(i->remaining_estimate<0) + return false; + for(vector::const_iterator i=trains.begin(); i!=trains.end(); ++i) if(i->state==MOVING) return true; @@ -415,7 +528,7 @@ bool TrainRoutePlanner::RoutingStep::is_goal() const bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const { - return time