X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=72714d730032094f5ae5419c24ffdef38a13ff1e;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=eb5724b762a9777494ec71ec23acccf8bf81a787;hpb=66c2c7ca5a4bd369293959bc211b040834343381;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index eb5724b..72714d7 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -15,6 +16,7 @@ #include "trackiter.h" #include "tracktype.h" #include "train.h" +#include "trainrouter.h" #include "vehicle.h" #include "vehicletype.h" #include "zone.h" @@ -22,19 +24,6 @@ using namespace std; using namespace Msp; -namespace { - -struct SetFlag -{ - bool &flag; - - SetFlag(bool &f): flag(f) { flag = true; } - ~SetFlag() { flag = false; } -}; - -} - - namespace R2C2 { Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): @@ -42,13 +31,8 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): loco_type(t), address(a), protocol(p), - priority(0), - yielding_to(0), preceding_train(0), - cur_blocks_end(blocks.end()), - clear_blocks_end(blocks.end()), - pending_block(0), - reserving(false), + allocator(*this), advancing(false), controller(new SimpleController), active(false), @@ -56,7 +40,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): speed_changing(false), reverse(false), functions(0), - end_of_route(false), travel_dist(0), pure_speed(false), speed_quantizer(0), @@ -78,16 +61,10 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event)); layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event)); - layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved)); layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Train::block_state_changed)); layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event)); - const set &tracks = layout.get_tracks(); - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - if((*i)->get_turnout_id()) - (*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), sigc::ref(**i)))); - controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed)); } @@ -106,16 +83,6 @@ void Train::set_name(const string &n) signal_name_changed.emit(name); } -void Train::set_priority(int p) -{ - priority = p; -} - -void Train::yield_to(const Train &t) -{ - yielding_to = &t; -} - void Train::add_vehicle(const VehicleType &vt) { Vehicle *veh = new Vehicle(layout, vt); @@ -170,7 +137,7 @@ void Train::set_active(bool a) if(active) { stop_timeout = Time::TimeStamp(); - reserve_more(); + allocator.reserve_more(); } else stop_timeout = Time::now()+2*Time::sec; @@ -219,139 +186,28 @@ void Train::remove_ai(TrainAI &ai) ais.erase(i); } -TrainAI *Train::get_tagged_ai(const string &tag) const -{ - for(list::const_iterator i=ais.begin(); i!=ais.end(); ++i) - if((*i)->get_tag()==tag) - return *i; - - return 0; -} - void Train::ai_message(const TrainAI::Message &msg) { for(list::iterator i=ais.begin(); i!=ais.end(); ++i) (*i)->message(msg); } -bool Train::set_route(const Route *r) -{ - free_noncritical_blocks(); - - Route *lead = 0; - if(r && !blocks.empty()) - { - TrackIter first = blocks.front().track_iter(); - TrackIter next = blocks.back().next().track_iter(); - if(!r->has_track(*next)) - { - lead = Route::find(next, *r); - if(!lead) - return false; - create_lead_route(lead, lead); - routes.push_front(lead); - } - else if(!r->has_track(*first)) - lead = create_lead_route(0, r); - } - - routes.clear(); - if(lead) - routes.push_back(lead); - if(r) - routes.push_back(r); - end_of_route = false; - - reserve_more(); - - signal_route_changed.emit(get_route()); - - return true; -} - -bool Train::go_to(Track &to) -{ - for(BlockList::const_iterator i=blocks.begin(); i!=cur_blocks_end; ++i) - if((*i)->has_track(to)) - { - signal_arrived.emit(); - return set_route(0); - } - - free_noncritical_blocks(); - - TrackIter next = blocks.back().next().track_iter(); - - Route *route = Route::find(next, to); - if(!route) - return false; - create_lead_route(route, route); - return set_route(route); -} - -bool Train::go_to(const Zone &to) -{ - set tracks; - for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) - tracks.insert((*i)->get_tracks().begin(), (*i)->get_tracks().end()); - - const Zone::TrackSet &ztracks = to.get_tracks(); - unsigned union_size = 0; - for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i) - union_size += tracks.count(*i); - - if(union_size==tracks.size() || union_size==ztracks.size()) - { - signal_arrived.emit(); - return set_route(0); - } - - free_noncritical_blocks(); - - TrackIter next = blocks.back().next().track_iter(); - - Route *route = Route::find(next, to); - if(!route) - return false; - create_lead_route(route, route); - route->add_tracks(ztracks); - return set_route(route); -} - -const Route *Train::get_route() const -{ - if(routes.empty()) - return 0; - return routes.front(); -} - -void Train::place(Block &block, unsigned entry) +void Train::place(const BlockIter &block) { + if(!block) + throw invalid_argument("Train::place"); if(controller->get_speed()) throw logic_error("moving"); - release_blocks(); - set_active(false); accurate_position = false; - blocks.push_back(BlockIter(&block, entry)); - if(!block.reserve(this)) - { - blocks.pop_back(); - return; - } + allocator.start_from(block); if(reverse) - { - TrackIter track = BlockIter(&block, entry).reverse().track_iter(); - vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_BUFFER); - } + vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER); else - { - const Block::Endpoint &bep = block.get_endpoint(entry); - vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER); - } + vehicles.back()->place(block.track_iter(), 0, Vehicle::BACK_BUFFER); } void Train::unplace() @@ -359,7 +215,7 @@ void Train::unplace() if(controller->get_speed()) throw logic_error("moving"); - release_blocks(); + allocator.clear(); set_active(false); accurate_position = false; @@ -368,36 +224,29 @@ void Train::unplace() (*i)->unplace(); } +void Train::stop_at(Block *block) +{ + allocator.stop_at(block); + if(active && !block) + allocator.reserve_more(); +} + bool Train::free_block(Block &block) { if(get_reserved_distance_until(&block, false)get_braking_distance()*1.3) return false; - unsigned nsens = 0; - for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i) - { - if(i->block()==&block) - { - if(nsens<1) - return false; - release_blocks(i, blocks.end()); - return true; - } - else if((*i)->get_sensor_id()) - ++nsens; - } - - return false; + return allocator.release_from(block); } void Train::free_noncritical_blocks() { - if(blocks.empty()) + if(allocator.empty()) return; if(controller->get_speed()==0) { - release_blocks(cur_blocks_end, blocks.end()); + allocator.release_noncurrent(); return; } @@ -406,14 +255,18 @@ void Train::free_noncritical_blocks() Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); - TrackIter track(veh.get_track(), veh.get_entry()); - BlockList::iterator block = blocks.begin(); + TrackIter track = veh.get_track_iter(); + BlockIter block = allocator.first(); + const BlockIter &last_cur = allocator.last_current(); + const BlockIter &last = allocator.last(); bool in_rsv = false; - while(block!=blocks.end() && !(*block)->has_track(*track)) + while(!block->has_track(*track)) { - ++block; - if(block==cur_blocks_end) + if(&*block==&*last_cur) in_rsv = true; + if(&*block==&*last) + break; + block = block.next(); } float dist = veh.get_offset(); @@ -428,21 +281,21 @@ void Train::free_noncritical_blocks() { track = track.next(); - if(!(*block)->has_track(*track)) + if(!block->has_track(*track)) { - ++block; - if(block==cur_blocks_end) + if(&*block==&*last_cur) in_rsv = true; - if(block==blocks.end()) + if(&*block==&*last) return; + block = block.next(); if(dist>min_dist && nsens>0) { - release_blocks(block, blocks.end()); + allocator.release_from(*block); return; } - if(in_rsv && (*block)->get_sensor_id()) + if(in_rsv && block->get_sensor_id()) ++nsens; } @@ -450,32 +303,29 @@ void Train::free_noncritical_blocks() } } -int Train::get_entry_to_block(const Block &block) const -{ - for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) - if(i->block()==&block) - return i->entry(); - return -1; -} - float Train::get_reserved_distance() const { - if(blocks.empty()) + if(allocator.empty()) return 0; float margin = 0; - TrackIter next = blocks.back().next().track_iter(); + TrackIter next = allocator.last().next().track_iter(); if(next && next->get_type().is_turnout()) margin = 15*layout.get_catalogue().get_scale(); return max(get_reserved_distance_until(0, false)-margin, 0.0f); } +void Train::reserve_more() +{ + allocator.reserve_more(); +} + void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) { if(!active && stop_timeout && t>=stop_timeout) { - release_blocks(cur_blocks_end, blocks.end()); + allocator.release_noncurrent(); stop_timeout = Time::TimeStamp(); } @@ -495,10 +345,9 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) r = !r; driver.set_loco_reverse(address, r); - release_blocks(cur_blocks_end, blocks.end()); - reverse_blocks(blocks); - - reserve_more(); + allocator.reverse(); + if(active) + allocator.reserve_more(); } if(speed_quantizer) @@ -523,9 +372,15 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front()); Track *track = vehicle.get_track(); + BlockIter first = allocator.first(); + BlockIter last_current = allocator.last_current(); bool ok = false; - for(BlockList::const_iterator i=blocks.begin(); (!ok && i!=cur_blocks_end); ++i) - ok = (*i)->has_track(*track); + for(BlockIter i=first; !ok; i=i.next()) + { + ok = i->has_track(*track); + if(i==last_current) + break; + } float d = speed*(dt/Time::sec); if(ok) @@ -543,23 +398,13 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) } } } - else if(end_of_route && cur_blocks_end==blocks.end()) - { - set_active(false); - signal_arrived.emit(); - set_route(0); - } - if(!blocks.empty() && !blocks.front()->get_sensor_id()) + if(!allocator.empty() && !allocator.first()->get_sensor_id()) { - float dist = get_reserved_distance_until(&*blocks.front(), true); + float dist = get_reserved_distance_until(&*allocator.first(), true); if(dist>10*layout.get_catalogue().get_scale()) - { - Block &block = *blocks.front(); - blocks.pop_front(); - block.reserve(0); - } + allocator.release_until(*allocator.first()); } } @@ -567,8 +412,6 @@ void Train::save(list &st) const { st.push_back((DataFile::Statement("name"), name)); - st.push_back((DataFile::Statement("priority"), priority)); - for(vector::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i) if(i!=vehicles.begin()) st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number())); @@ -580,35 +423,28 @@ void Train::save(list &st) const st.push_back(ss); } - if(!blocks.empty() && cur_blocks_end!=blocks.begin()) { - BlockList blks(blocks.begin(), BlockList::const_iterator(cur_blocks_end)); - if(reverse) - reverse_blocks(blks); - - BlockIter prev = blks.front().flip(); - st.push_back((DataFile::Statement("block_hint"), prev->get_id())); - - for(BlockList::const_iterator i=blks.begin(); i!=blks.end(); ++i) - st.push_back((DataFile::Statement("block"), (*i)->get_id())); - } - - if(!routes.empty()) - { - list::const_iterator i = routes.begin(); - for(; (i!=routes.end() && (*i)->is_temporary()); ++i) ; - if(i!=routes.end()) - st.push_back((DataFile::Statement("route"), (*i)->get_name())); + DataFile::Statement ss("blocks"); + allocator.save(ss.sub); + st.push_back(ss); } // XXX Need more generic way of saving AI state for(list::const_iterator i=ais.begin(); i!=ais.end(); ++i) - if(Timetable *timetable = dynamic_cast(*i)) + { + if(TrainRouter *router = dynamic_cast(*i)) + { + DataFile::Statement ss("router"); + router->save(ss.sub); + st.push_back(ss); + } + else if(Timetable *timetable = dynamic_cast(*i)) { DataFile::Statement ss("timetable"); timetable->save(ss.sub); st.push_back(ss); } + } } void Train::control_changed(const Controller::Control &ctrl) @@ -648,26 +484,18 @@ void Train::block_state_changed(Block &block, Block::State state) { if(state==Block::MAYBE_ACTIVE) { - // Find the first sensor block from our reserved blocks that isn't this sensor - BlockList::iterator end; - unsigned result = 0; - for(end=cur_blocks_end; end!=blocks.end(); ++end) - if((*end)->get_sensor_id()) - { - if(&**end!=&block) - { - if(result==0) - result = 2; - else if(result==1) - break; - } - else if(result==0) - result = 1; - else if(result==2) - result = 3; - } + const BlockIter &first = allocator.first(); + const BlockIter &last_cur = allocator.last_current(); + bool valid = false; + for(BlockIter i=first; !valid; i=i.next()) + { + if(&*i==&block) + valid = true; + if(&*i==&*last_cur) + break; + } - if(result==1) + if(valid) { // Compute speed and update related state float travel_time_secs = (Time::now()-last_entry_time)/Time::sec; @@ -676,351 +504,67 @@ void Train::block_state_changed(Block &block, Block::State state) speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs); travel_dist = 0; - for(BlockList::iterator j=cur_blocks_end; j!=end; ++j) + unsigned entry = allocator.get_entry_to_block(block); + for(BlockIter i(&block, entry);; i=i.next()) { - travel_dist += (*j)->get_path_length(j->entry()); + travel_dist += i->get_path_length(i.entry()); - if(&**j==&block && !advancing) + if(&*i==&block && !advancing && vehicles.front()->get_track()) { - TrackIter track = j->track_iter(); + TrackIter track = i.track_iter(); if(reverse) { track = track.flip(); - vehicles.back()->place(*track, track.entry(), 0, Vehicle::BACK_AXLE); + vehicles.back()->place(track, 0, Vehicle::BACK_AXLE); } else - vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_AXLE); + vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE); } + + if(i==last_cur) + break; } last_entry_time = Time::now(); pure_speed = true; accurate_position = true; overshoot_dist = 0; - - // Check if we've reached the next route - if(routes.size()>1) - { - const Route &route = **(++routes.begin()); - for(BlockList::iterator j=cur_blocks_end; j!=end; ++j) - if(route.has_track(*j->track_iter())) - { - routes.pop_front(); - // XXX Exceptions? - signal_route_changed.emit(routes.front()); - break; - } - } - - // Move blocks up to the next sensor to our current blocks - for(BlockList::iterator j=cur_blocks_end; j!=end; ++j) - signal_advanced.emit(**j); - cur_blocks_end = end; - - // Try to get more blocks if we're moving - if(active) - reserve_more(); - } - else if(result==3) - layout.emergency("Sensor for "+name+" triggered out of order"); - } - else if(state==Block::INACTIVE) - { - const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back()); - - // Find the first sensor in our current blocks that's still active - BlockList::iterator end = blocks.begin(); - for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i) - { - if((*i)->has_track(*veh.get_track())) - break; - if((*i)->get_sensor_id()) - { - if(layout.get_driver().get_sensor((*i)->get_sensor_id())) - break; - else - { - end = i; - ++end; - } - } } - - if(end!=blocks.begin() && end!=cur_blocks_end) - // Free blocks up to the last inactive sensor - release_blocks(blocks.begin(), end); } } -void Train::turnout_path_changed(Track &track) -{ - for(list::iterator i=blocks.begin(); i!=blocks.end(); ++i) - if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving) - check_turnout_paths(false); -} - void Train::halt_event(bool h) { if(h) accurate_position = false; } -void Train::block_reserved(const Block &block, const Train *train) -{ - if(&block==pending_block && !train && !reserving) - reserve_more(); -} - -void Train::reserve_more() -{ - if(!active || blocks.empty() || end_of_route) - return; - - BlockIter start = blocks.back(); - - pending_block = 0; - preceding_train = 0; - - // See how many sensor blocks and how much track we already have - unsigned nsens = 0; - float dist = 0; - for(BlockList::const_iterator i=cur_blocks_end; i!=blocks.end(); ++i) - { - if((*i)->get_sensor_id()) - ++nsens; - if(nsens>0) - dist += (*i)->get_path_length(i->entry()); - } - - list::iterator cur_route = routes.begin(); - advance_route(cur_route, *start.track_iter()); - - float approach_margin = 50*layout.get_catalogue().get_scale(); - float min_dist = controller->get_braking_distance()*1.3+approach_margin*2; - - BlockIter block = start; - list::iterator good_end = blocks.end(); - Train *blocking_train = 0; - BlockList contested_blocks; - - SetFlag setf(reserving); - - while(1) - { - BlockIter last = block; - block = block.next(cur_route!=routes.end() ? *cur_route : 0); - if(!block || block->get_endpoints().size()<2) - { - if(!blocking_train) - { - good_end = blocks.end(); - end_of_route = true; - } - break; - } - - TrackIter track = block.track_iter(); - - if(cur_route!=routes.end()) - { - if(!advance_route(cur_route, *track)) - { - // Keep the blocks if we arrived at the end of the route - if(!blocking_train) - { - good_end = blocks.end(); - end_of_route = true; - } - break; - } - } - - if(block->get_turnout_id() && !last->get_turnout_id()) - { - /* We can keep the blocks if we arrive at a turnout from a non-turnout - block. Having a turnout block as our last reserved block is not good - as it would limit our diversion possibilities for little benefit. */ - good_end = blocks.end(); - if(nsens>=3 && dist>=min_dist) - break; - } - - if(blocking_train) - { - if(block->get_train()!=blocking_train) - { - if(blocking_train->free_block(*contested_blocks.back())) - { - // Roll back and start actually reserving the blocks - block = blocks.back(); - cur_route = routes.begin(); - advance_route(cur_route, *block.track_iter().track()); - if(blocking_train->get_priority()==priority) - blocking_train->yield_to(*this); - blocking_train = 0; - continue; - } - else - { - yield_to(*blocking_train); - pending_block = contested_blocks.front().block(); - break; - } - } - else - { - contested_blocks.push_back(block); - continue; - } - } - - blocks.push_back(block); - bool reserved = block->reserve(this); - if(!reserved) - { - blocks.pop_back(); - /* We've found another train. If it wants to exit the block from the - same endpoint we're trying to enter from or the other way around, - treat it as coming towards us. Otherwise treat it as going in the - same direction. */ - Train *other_train = block->get_train(); - int other_entry = other_train->get_entry_to_block(*block); - if(other_entry<0) - throw logic_error("block reservation inconsistency"); - - unsigned exit = block.reverse().entry(); - unsigned other_exit = BlockIter(block.block(), other_entry).reverse().entry(); - bool entry_conflict = (block.entry()==other_exit); - bool exit_conflict = (exit==static_cast(other_entry)); - if(!entry_conflict && !last->get_turnout_id()) - { - /* The other train is not coming to the blocks we're holding, so we - can keep them. */ - good_end = blocks.end(); - - if(static_cast(other_entry)==block.entry()) - preceding_train = other_train; - } - - int other_prio = other_train->get_priority(); - - if(!entry_conflict && !exit_conflict && other_priofree_block(*block)) - { - blocks.push_back(block); - if(!(reserved = block->reserve(this))) - blocks.pop_back(); - } - } - else if(other_train!=yielding_to && (other_prioget_sensor_id()) - ++nsens; - if(nsens>0) - dist += block->get_path_length(block.entry()); - } - - // Unreserve blocks that were not good - release_blocks(good_end, blocks.end()); - - if(blocks.back()!=start) - // We got some new blocks, so no longer need to yield - yielding_to = 0; - - check_turnout_paths(true); - - // Make any sensorless blocks at the beginning immediately current - while(cur_blocks_end!=clear_blocks_end && !(*cur_blocks_end)->get_sensor_id()) - ++cur_blocks_end; -} - -void Train::check_turnout_paths(bool set) -{ - if(clear_blocks_end==blocks.end()) - return; - - for(list::iterator i=clear_blocks_end; i!=blocks.end(); ++i) - { - if((*i)->get_turnout_id()) - { - TrackIter track = i->track_iter(); - const TrackType::Endpoint &track_ep = track.endpoint(); - - unsigned path = 0; - list::iterator j = i; - if(++j!=blocks.end()) - { - TrackIter rev = j->track_iter().flip(); - unsigned mask = rev.endpoint().paths&track_ep.paths; - for(path=0; mask>1; mask>>=1, ++path) ; - } - else - return; - - if(path!=track->get_active_path()) - { - if(set) - track->set_active_path(path); - - /* Check again, in case the driver was able to service the request - instantly */ - if(!set || path!=track->get_active_path()) - continue; - } - } - - if(i==clear_blocks_end) - ++clear_blocks_end; - if(i==cur_blocks_end && !(*i)->get_sensor_id()) - ++cur_blocks_end; - } -} - float Train::get_reserved_distance_until(const Block *until_block, bool back) const { - if(blocks.empty()) + if(allocator.empty()) return 0; Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front()); const VehicleType &vtype = veh.get_type(); - TrackIter track(veh.get_track(), veh.get_entry()); + TrackIter track = veh.get_track_iter(); if(!track) // XXX Probably unnecessary return 0; - BlockList::const_iterator block = blocks.begin(); - while(block!=clear_blocks_end && !(*block)->has_track(*track)) - ++block; - if(block==clear_blocks_end || &**block==until_block) + const BlockIter &first = allocator.first(); + const BlockIter &last = allocator.last(); + BlockIter block = first; + while(!block->has_track(*track)) + { + if(&*block==&*last) + return 0; + block = block.next(); + } + if(&*block==until_block) return 0; + if(back) + block = block.reverse(); + float result = veh.get_offset(); if(reverse!=back) track = track.reverse(); @@ -1034,22 +578,21 @@ float Train::get_reserved_distance_until(const Block *until_block, bool back) co if(!track) break; - if(!(*block)->has_track(*track)) + if(!block->has_track(*track)) { if(back) { - if(block==blocks.begin()) + if(&*block==&*first) break; - --block; } else { - ++block; - if(block==clear_blocks_end) + if(&*block==&*last) break; } + block = block.next(); - if(&**block==until_block) + if(&*block==until_block) break; } @@ -1059,136 +602,33 @@ float Train::get_reserved_distance_until(const Block *until_block, bool back) co return result; } -void Train::release_blocks() -{ - release_blocks(blocks.begin(), blocks.end()); -} - -void Train::release_blocks(BlockList::iterator begin, BlockList::iterator end) -{ - while(begin!=end) - { - if(begin==cur_blocks_end) - cur_blocks_end = end; - if(begin==clear_blocks_end) - clear_blocks_end = end; - - Block &block = **begin; - blocks.erase(begin++); - block.reserve(0); - - if(begin==blocks.end()) - end_of_route = false; - } -} - -void Train::reverse_blocks(BlockList &blks) const -{ - blks.reverse(); - for(BlockList::iterator i=blks.begin(); i!=blks.end(); ++i) - *i = i->reverse(); -} - -bool Train::advance_route(list::iterator &iter, Track &track) -{ - while(iter!=routes.end() && !(*iter)->has_track(track)) - ++iter; - if(iter==routes.end()) - return false; - - return true; -} - -Route *Train::create_lead_route(Route *lead, const Route *target) -{ - if(!lead) - { - lead = new Route(layout); - lead->set_name("Lead"); - lead->set_temporary(true); - } - - set tracks; - for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i) - { - const set &btracks = (*i)->get_tracks(); - for(set::const_iterator j=btracks.begin(); j!=btracks.end(); ++j) - if(!target || !target->has_track(**j)) - tracks.insert(*j); - } - - lead->add_tracks(tracks); - - return lead; -} - Train::Loader::Loader(Train &t): DataFile::ObjectLoader(t), prev_block(0), blocks_valid(true) { - add("block", &Loader::block); - add("block_hint", &Loader::block_hint); + add("blocks", &Loader::blocks); add("name", &Loader::name); - add("priority", &Train::priority); add("quantized_speed", &Loader::quantized_speed); - add("route", &Loader::route); + add("router", &Loader::router); add("timetable", &Loader::timetable); add("vehicle", &Loader::vehicle); } void Train::Loader::finish() { - if(!obj.blocks.empty()) + if(!obj.allocator.empty()) { - TrackIter track = obj.blocks.front().track_iter(); + TrackIter track = obj.allocator.first().track_iter(); float offset = 2*obj.layout.get_catalogue().get_scale(); - obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER); - } -} - -void Train::Loader::block(unsigned id) -{ - if(!blocks_valid) - return; - - Block *blk; - try - { - blk = &obj.layout.get_block(id); - } - catch(const key_error &) - { - blocks_valid = false; - return; + obj.vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER); } - - int entry = -1; - if(prev_block) - entry = blk->get_endpoint_by_link(*prev_block); - if(entry<0) - entry = 0; - - obj.blocks.push_back(BlockIter(blk, entry)); - blk->reserve(&obj); - - if(blk->get_sensor_id()) - obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true); - - prev_block = blk; } -void Train::Loader::block_hint(unsigned id) +void Train::Loader::blocks() { - try - { - prev_block = &obj.layout.get_block(id); - } - catch(const key_error &) - { - blocks_valid = false; - } + load_sub(obj.allocator); } void Train::Loader::name(const string &n) @@ -1202,9 +642,10 @@ void Train::Loader::quantized_speed() load_sub(*obj.speed_quantizer); } -void Train::Loader::route(const string &n) +void Train::Loader::router() { - obj.set_route(&obj.layout.get_route(n)); + TrainRouter *rtr = new TrainRouter(obj); + load_sub(*rtr); } void Train::Loader::timetable()