X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=2fac984f03eba6ba23ee1c1ffad0c735d755aaf1;hb=3de7ae761b9a1fd1c1cd40457cc7067f4cf57c36;hp=a6a47c0b5b13a291e30096795c87d2f8c1908628;hpb=c796e17cef61ad2e3f476b6037892d7bc6c52680;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index a6a47c0..2fac984 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -17,7 +17,8 @@ TrainRouter::TrainRouter(Train &t): priority(0), arriving(0), destination(0), - update_pending(false) + destination_changed(false), + metrics_stale(false) { train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved)); train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced)); @@ -60,56 +61,42 @@ bool TrainRouter::set_route(const Route *r) routes.push_back(lead); if(r) routes.push_back(r); - train.stop_at(0); - arriving = 0; - /* TODO destination should also be cleared when manually setting a different - route, but not when the planner calls this. */ - if(!r) - { - destination = 0; - waypoints.clear(); - } + destination = 0; + waypoints.clear(); + sequence_points.clear(); + pending_sequence_checks.clear(); + current_sequence = 0; - train.refresh_blocks_from(*fncb); - - const Route *route = get_route(); - signal_route_changed.emit(route); - signal_event.emit(Message("route-changed", route)); + route_changed(); return true; } -bool TrainRouter::add_route(const Route &r) +const Route *TrainRouter::get_route() const { if(routes.empty()) - return set_route(&r); - - // TODO Check that it can be reached from previous routes - routes.push_back(&r); - - return true; + return 0; + return routes.front(); } -void TrainRouter::add_wait(Block &block, Train *tr) +void TrainRouter::route_changed() { - Wait wait; - wait.block = █ - wait.train = tr; - waits.push_back(wait); -} + train.stop_at(0); + arriving = 0; + BlockIter fncb = train.get_first_noncritical_block(); + train.refresh_blocks_from(*fncb); -const Route *TrainRouter::get_route() const -{ - if(routes.empty()) - return 0; - return routes.front(); + const Route *route = get_route(); + signal_route_changed.emit(route); + signal_event.emit(Message("route-changed", route)); } void TrainRouter::set_destination(const TrackChain &d) { destination = &d; - update_pending = true; + destination_changed = true; + metrics_stale = true; } bool TrainRouter::is_destination(Track &track) const @@ -123,7 +110,8 @@ bool TrainRouter::is_destination(Track &track) const void TrainRouter::add_waypoint(const TrackChain &wp) { waypoints.push_back(&wp); - update_pending = true; + destination_changed = true; + metrics_stale = true; } bool TrainRouter::is_waypoint(unsigned index, Track &track) const @@ -138,7 +126,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const { if(!destination) throw logic_error("no metrics"); - else if(update_pending) + else if(metrics_stale) throw logic_error("metrics are stale"); if(index<0) @@ -152,7 +140,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const void TrainRouter::set_departure_delay(const Time::TimeDelta &d) { delay = d; - update_pending = true; + destination_changed = true; } void TrainRouter::message(const Message &msg) @@ -193,8 +181,37 @@ void TrainRouter::tick(const Time::TimeDelta &dt) delay = Time::zero; } - if(update_pending) - create_plans(train.get_layout()); + if(destination_changed) + { + if(!planner) + start_planning(train.get_layout()); + else if(planner->get_result()!=TrainRoutePlanner::PENDING) + { + destination_changed = false; + if(planner->get_result()==TrainRoutePlanner::COMPLETE) + { + const list &planned_routes = planner->get_routes_for(train); + routes.clear(); + routes.push_back(create_lead_route(0, planned_routes.front())); + routes.insert(routes.end(), planned_routes.begin(), planned_routes.end()); + sequence_points = planner->get_sequence_for(train); + pending_sequence_checks.clear(); + current_sequence = 0; + + route_changed(); + } + planner = 0; + } + } + + for(list::iterator i=pending_sequence_checks.begin(); i!=pending_sequence_checks.end(); ++i) + if((*i)->preceding_train->get_ai_of_type()->get_current_sequence()>=(*i)->sequence_in) + { + (*i)->preceding_train = 0; + if(*i==&sequence_points.front()) + train.stop_at(0); + } + pending_sequence_checks.clear(); if(arriving==1 && !train.get_speed()) { @@ -223,12 +240,36 @@ void TrainRouter::block_reserved(Block &block, Train *t) { if(t!=&train) { - if(!waits.empty() && waits.front().block==&block) + if(!t) + return; + + TrainRouter *other_router = 0; + for(list::iterator i=sequence_points.begin(); i!=sequence_points.end(); ++i) + if(i->block==&block && i->preceding_train==t) + { + if(!other_router) + other_router = t->get_ai_of_type(); + if(other_router->get_current_sequence()>=i->sequence_in) + { + i->preceding_train = 0; + if(i==sequence_points.begin()) + train.stop_at(0); + } + else + pending_sequence_checks.push_back(&*i); + } + + return; + } + + if(!sequence_points.empty()) + { + SequencePoint &sp = sequence_points.front(); + if(sp.block==&block) { - train.stop_at(0); - waits.pop_front(); + current_sequence = sp.sequence_out; + sequence_points.pop_front(); } - return; } BlockIter b_iter = t->get_block_allocator().iter_for(block); @@ -254,8 +295,12 @@ void TrainRouter::block_reserved(Block &block, Train *t) return; } - if(!waits.empty() && waits.front().block==b_iter_next.block()) - train.stop_at(&block); + if(!sequence_points.empty()) + { + SequencePoint &sp = sequence_points.front(); + if(sp.preceding_train && sp.block==b_iter_next.block()) + train.stop_at(&block); + } } } @@ -371,10 +416,15 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target) bool TrainRouter::advance_route(RouteList::iterator &iter, const Block &block) { const set &tracks = block.get_tracks(); + unsigned turnout_addr = block.get_turnout_address(); for(; iter!=routes.end(); ++iter) + { + if(turnout_addr && (*iter)->get_turnout(turnout_addr)<0) + continue; for(set::const_iterator j=tracks.begin(); j!=tracks.end(); ++j) if((*iter)->has_track(**j)) return true; + } return false; } @@ -385,25 +435,31 @@ bool TrainRouter::is_on_route(const Block &block) return advance_route(iter, block); } -void TrainRouter::create_plans(Layout &layout) +void TrainRouter::start_planning(Layout &layout) { + RefPtr planner = new TrainRoutePlanner(layout); + const map &trains = layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) if(TrainRouter *router = i->second->get_ai_of_type()) { - if(router->update_pending) + if(router->metrics_stale) + { router->create_metrics(); - router->update_pending = false; + router->metrics_stale = false; + } + router->planner = planner; } - TrainRoutePlanner planner(layout); - planner.plan(); + planner->plan(); } -TrainRouter::Wait::Wait(): - block(0), - train(0) +TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o): + block(&b), + preceding_train(0), + sequence_in(0), + sequence_out(o) { }