X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=dbe6035499c9e61663b2f6337448c35e5518b9d2;hb=9976acc82d98c8aecde0152a72be8cc8882e35ff;hp=30d9f5e482ee054aa4a5dee7df770abbddd743a7;hpb=997e14793d8e58d3cb14a495970b36b1e0cad39b;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp index 30d9f5e..dbe6035 100644 --- a/source/libr2c2/trainrouteplanner.cpp +++ b/source/libr2c2/trainrouteplanner.cpp @@ -22,7 +22,7 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout): for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) { TrainRoutingInfo info(*i->second); - if(info.router && info.router->get_destination()) + if(info.destination) routed_trains.push_back(info); } } @@ -206,8 +206,24 @@ void TrainRoutePlanner::finalize_plan() TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t): train(&t), speed(train->get_maximum_speed()), - router(train->get_ai_of_type()) + router(train->get_ai_of_type()), + destination(0), + has_duration(false) { + if(router) + { + destination = router->get_destination(); + waypoints.resize(router->get_n_waypoints()); + metrics.resize(waypoints.size()+1); + metrics[0] = &router->get_metric(-1); + for(unsigned i=0; iget_waypoint(i); + metrics[i+1] = &router->get_metric(i); + } + has_duration = router->get_trip_duration(); + } + // If no maximum speed is specified, use a sensible default if(!speed) speed = 20*train->get_layout().get_catalogue().get_scale(); @@ -248,7 +264,8 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf): occupied_tracks(0), state(MOVING), delay(info->router->get_departure_delay()), - waypoint(info->router->get_n_waypoints() ? 0 : -1), + duration(info->router->get_trip_duration()), + waypoint(info->waypoints.empty() ? -1 : 0), blocked_by(-1) { const Vehicle *veh = &info->train->get_vehicle(0); @@ -284,6 +301,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), @@ -306,6 +324,9 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const { + if(state==ARRIVED && !duration && info->has_duration) + return false; + OccupiedTrack *occ = occupied_tracks; for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next) if(occ->track==&trk) @@ -315,18 +336,17 @@ bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const bool TrainRoutePlanner::TrainRoutingState::check_arrival() { - TrainRouter &router = *info->router; TrackIter next_track = track.next(path); - if(waypoint<0 && router.is_destination(*track) && !router.is_destination(*next_track)) + if(waypoint<0 && info->destination->has_track(*track) && !info->destination->has_track(*next_track)) { state = ARRIVED; return true; } - else if(waypoint>=0 && router.is_waypoint(waypoint, *track) && !router.is_waypoint(waypoint, *next_track)) + else if(waypoint>=0 && info->waypoints[waypoint]->has_track(*track) && !info->waypoints[waypoint]->has_track(*next_track)) { ++waypoint; - if(waypoint>=static_cast(router.get_n_waypoints())) + if(waypoint>=static_cast(info->waypoints.size())) waypoint = -1; } @@ -373,6 +393,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) @@ -392,7 +415,7 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path) void TrainRoutePlanner::TrainRoutingState::update_estimate() { TrackIter iter = track.reverse(path); - float distance = info->router->get_metric(waypoint).get_distance_from(*iter.track(), iter.entry()); + float distance = info->metrics[waypoint+1]->get_distance_from(*iter.track(), iter.entry()); distance += track->get_type().get_path_length(path)-offset; remaining_estimate = distance; } @@ -404,6 +427,7 @@ TrainRoutePlanner::RoutingStep::RoutingStep(): TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p): time(p->time), + penalty(p->penalty), cost_estimate(p->cost_estimate), trains(p->trains), prev(p) @@ -450,11 +474,20 @@ void TrainRoutePlanner::RoutingStep::create_successors(list &new_st new_steps.push_back(next); } + new_steps.sort(); + for(list::iterator i=new_steps.begin(); ++i!=new_steps.end(); ) + { + i->penalty += 5*Time::sec; + i->update_estimate(); + } + if(next_entry_ep.paths!=next_track->get_type().get_paths()) { RoutingStep wait(this); wait.advance(dt); wait.trains[train_index].state = WAITING; + wait.penalty += 15*Time::sec; + wait.update_estimate(); if(wait.is_viable()) new_steps.push_back(wait); } @@ -550,7 +583,7 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt) void TrainRoutePlanner::RoutingStep::update_estimate() { - cost_estimate = Time::zero; + cost_estimate = penalty; 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;