X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b1fbc6a76ebb1bf4ad02f85d981f465fef1a1759;hb=ecd7af790bd3ab7c7e768f68968379e1feea56a9;hp=b7dc2470c4c1a98e98e5aae789c39e4130e1f31f;hpb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index b7dc247..b1fbc6a 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -5,21 +5,21 @@ #include #include #include -#include "aicontrol.h" +#include "beamgate.h" +#include "block.h" #include "catalogue.h" #include "driver.h" #include "layout.h" -#include "route.h" #include "simplecontroller.h" #include "speedquantizer.h" #include "timetable.h" +#include "trackcircuit.h" #include "trackiter.h" #include "tracktype.h" #include "train.h" #include "trainrouter.h" #include "vehicle.h" #include "vehicletype.h" -#include "zone.h" using namespace std; using namespace Msp; @@ -35,7 +35,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): allocator(*this), advancing(false), controller(new SimpleController), - active(false), current_speed_step(0), speed_changing(false), reverse(false), @@ -53,18 +52,20 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): speed_quantizer = new SpeedQuantizer(speed_steps); vehicles.push_back(new Vehicle(layout, loco_type)); + vehicles.back()->set_train(this); layout.add_train(*this); - layout.get_driver().add_loco(address, protocol, loco_type); + loco_id = layout.get_driver().add_loco(address, protocol, loco_type); 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_state_changed.connect(sigc::mem_fun(this, &Train::block_state_changed)); - layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event)); controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed)); + + allocator.signal_advanced.connect(sigc::mem_fun(this, &Train::advanced)); + allocator.signal_rear_advanced.connect(signal_rear_advanced); } Train::~Train() @@ -87,6 +88,8 @@ void Train::add_vehicle(const VehicleType &vt) Vehicle *veh = new Vehicle(layout, vt); vehicles.back()->attach_back(*veh); vehicles.push_back(veh); + veh->set_train(this); + signal_vehicle_added.emit(vehicles.size()-1, *veh); } void Train::remove_vehicle(unsigned i) @@ -95,10 +98,17 @@ void Train::remove_vehicle(unsigned i) throw out_of_range("Train::remove_vehicle"); if(i==0) throw logic_error("can't remove locomotive"); - delete vehicles[i]; + + Vehicle *veh = vehicles[i]; vehicles.erase(vehicles.begin()+i); + veh->detach_front(); if(idetach_back(); vehicles[i-1]->attach_back(*vehicles[i]); + } + signal_vehicle_removed.emit(i, *veh); + delete veh; } unsigned Train::get_n_vehicles() const @@ -125,28 +135,11 @@ void Train::set_control(const string &n, float v) controller->set_control(n, v); } -void Train::set_active(bool a) -{ - if(a==active) - return; - if(!a && controller->get_speed()) - throw logic_error("moving"); - - active = a; - if(active) - { - stop_timeout = Time::TimeStamp(); - allocator.reserve_more(); - } - else - stop_timeout = Time::now()+2*Time::sec; -} - void Train::set_function(unsigned func, bool state) { if(!loco_type.get_functions().count(func)) throw invalid_argument("Train::set_function"); - layout.get_driver().set_loco_function(address, func, state); + layout.get_driver().set_loco_function(loco_id, func, state); } float Train::get_control(const string &ctrl) const @@ -167,6 +160,18 @@ float Train::get_quantized_speed() const return controller->get_speed(); } +float Train::get_maximum_speed() const +{ + float ms = 0; + for(vector::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i) + { + float vms = (*i)->get_type().get_maximum_speed(); + if(ms<=0 || (vms>0 && vms>func)&1; @@ -191,22 +196,29 @@ void Train::ai_message(const TrainAI::Message &msg) (*i)->message(msg); } -void Train::place(const BlockIter &block) +bool Train::place(const BlockIter &block) { if(!block) throw invalid_argument("Train::place"); if(controller->get_speed()) throw logic_error("moving"); - set_active(false); accurate_position = false; + last_entry_block = BlockIter(); - allocator.start_from(block); - - if(reverse) - vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER); + if(allocator.start_from(block)) + { + if(reverse) + vehicles.front()->place(block.reverse().track_iter(), VehiclePlacement::FRONT_BUFFER); + else + vehicles.back()->place(block.track_iter(), VehiclePlacement::BACK_BUFFER); + return true; + } else - vehicles.back()->place(block.track_iter(), 0, Vehicle::BACK_BUFFER); + { + unplace(); + return false; + } } void Train::unplace() @@ -215,9 +227,8 @@ void Train::unplace() throw logic_error("moving"); allocator.clear(); - - set_active(false); accurate_position = false; + last_entry_block = BlockIter(); for(vector::iterator i=vehicles.begin(); i!=vehicles.end(); ++i) (*i)->unplace(); @@ -226,80 +237,68 @@ void Train::unplace() void Train::stop_at(Block *block) { allocator.stop_at(block); - if(active && !block) - allocator.reserve_more(); } -bool Train::free_block(Block &block) +bool Train::is_block_critical(const Block &block) const { - if(get_reserved_distance_until(&block, false)get_braking_distance()*1.3) - return false; + if(allocator.is_block_current(block)) + return true; - return allocator.release_from(block); + BlockIter i = check_critical_blocks(&block); + return i.block()==█ } -void Train::free_noncritical_blocks() +BlockIter Train::get_last_critical_block() const +{ + return check_critical_blocks(0); +} + +BlockIter Train::check_critical_blocks(const Block *check) const { if(allocator.empty()) - return; + return BlockIter(); + + BlockIter i = allocator.last_current(); if(controller->get_speed()==0) - { - allocator.release_noncurrent(); - return; - } + return i; + + BlockIter last = allocator.last(); + if(i.block()==last.block()) + return i; float margin = 10*layout.get_catalogue().get_scale(); float min_dist = controller->get_braking_distance()*1.3+margin; - Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); - - 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->has_track(*track)) + float dist = 0; + bool sensor_seen = false; + i = i.next(); + while(i.block()!=last.block() && i.block()!=check) { - if(&*block==&*last_cur) - in_rsv = true; - if(&*block==&*last) - break; - block = block.next(); - } + dist += i->get_path_length(i.entry()); - float dist = veh.get_offset(); - if(reverse) - track.reverse(); - else - dist = track->get_type().get_path_length(track->get_active_path())-dist; - dist -= veh.get_type().get_length()/2; + if(i->get_sensor_address()) + sensor_seen = true; - bool nsens = 0; - while(1) - { - track = track.next(); + if(dist>min_dist && sensor_seen) + break; - if(!block->has_track(*track)) - { - if(&*block==&*last_cur) - in_rsv = true; - if(&*block==&*last) - return; - block = block.next(); + BlockIter j = i.next(); + if(j->get_train()!=this) + break; - if(dist>min_dist && nsens>0) - { - allocator.release_from(*block); - return; - } + i = j; + } - if(in_rsv && block->get_sensor_id()) - ++nsens; - } + return i; +} - dist += track->get_type().get_path_length(track->get_active_path()); - } +void Train::refresh_blocks_from(Block &block) +{ + if(is_block_critical(block)) + allocator.rewind_to(*get_last_critical_block().next()); + else + allocator.rewind_to(block); } float Train::get_reserved_distance() const @@ -312,26 +311,30 @@ float Train::get_reserved_distance() const 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); + return max(get_reserved_distance_until(0)-margin, 0.0f); } -void Train::reserve_more() +void Train::tick(const Time::TimeDelta &dt) { - allocator.reserve_more(); -} - -void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) -{ - if(!active && stop_timeout && t>=stop_timeout) + if(stop_timeout) { - allocator.release_noncurrent(); - stop_timeout = Time::TimeStamp(); + stop_timeout = max(stop_timeout-dt, Time::zero); + if(stop_timeout<=Time::zero) + allocator.set_active(false); } + travel_time += dt; + Driver &driver = layout.get_driver(); + bool intent_to_move = false; for(list::iterator i=ais.begin(); i!=ais.end(); ++i) - (*i)->tick(t, dt); + { + (*i)->tick(dt); + if((*i)->has_intent_to_move()) + intent_to_move = true; + } + controller->tick(dt); float speed = controller->get_speed(); bool moving = speed>0; @@ -342,11 +345,10 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) bool r = reverse; if(loco_type.get_swap_direction()) r = !r; - driver.set_loco_reverse(address, r); + driver.set_loco_reverse(loco_id, r); allocator.reverse(); - if(active) - allocator.reserve_more(); + last_entry_block = BlockIter(); } if(speed_quantizer) @@ -355,7 +357,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power()) { speed_changing = true; - driver.set_loco_speed(address, speed_step); + driver.set_loco_speed(loco_id, speed_step); pure_speed = false; } @@ -365,13 +367,14 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) if(moving) { - if(!active) - set_active(true); + if(!allocator.is_active()) + allocator.set_active(true); Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front()); float d = speed*(dt/Time::sec); - if(allocator.is_block_current(vehicle.get_track()->get_block())) + Block &block = vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block(); + if(allocator.is_block_current(block)) { SetFlag setf(advancing); vehicle.advance(reverse ? -d : d); @@ -381,28 +384,25 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) overshoot_dist += d; if(overshoot_dist>40*layout.get_catalogue().get_scale()) { - layout.emergency(name+" has not arrived at sensor"); + layout.emergency(&block, name+" has not arrived at sensor"); accurate_position = false; } } } - - if(!allocator.empty() && !allocator.first()->get_sensor_id()) - { - float dist = get_reserved_distance_until(&*allocator.first(), true); - - if(dist>10*layout.get_catalogue().get_scale()) - allocator.release_until(*allocator.first()); - } + else if(intent_to_move && !allocator.is_active()) + allocator.set_active(true); + else if(allocator.is_active() && !intent_to_move && !stop_timeout) + stop_timeout = 2*Time::sec; } void Train::save(list &st) const { st.push_back((DataFile::Statement("name"), name)); + const Catalogue &cat = layout.get_catalogue(); 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())); + st.push_back((DataFile::Statement("vehicle"), cat.get_name(&(*i)->get_type()))); if(speed_quantizer) { @@ -440,24 +440,24 @@ void Train::control_changed(const Controller::Control &ctrl) signal_control_changed.emit(ctrl.name, ctrl.value); } -void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev) +void Train::loco_speed_event(unsigned id, unsigned speed, bool rev) { - if(addr==address) + if(id==loco_id) { current_speed_step = speed; bool r = reverse; if(loco_type.get_swap_direction()) r = !r; if(rev!=r) - layout.get_driver().set_loco_reverse(address, r); + layout.get_driver().set_loco_reverse(loco_id, r); speed_changing = false; pure_speed = false; } } -void Train::loco_func_event(unsigned addr, unsigned func, bool state) +void Train::loco_func_event(unsigned id, unsigned func, bool state) { - if(addr==address) + if(id==loco_id) { if(state) functions |= 1<0) - travel_distance = 0; + float travel_distance = 0; for(BlockIter i=last_entry_block; &*i!=█ i=i.next()) - { - if(i->get_sensor_id()) - return; - if(travel_distance>=0) - travel_distance += i->get_path_length(i.entry()); - } + travel_distance += i->get_path_length(i.entry()); if(travel_distance>0) { - float travel_time_secs = (Time::now()-last_entry_time)/Time::sec; + float travel_time_secs = travel_time/Time::sec; if(travel_time_secs>=2) speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs); @@ -496,21 +495,43 @@ void Train::block_state_changed(Block &block, Block::State state) } last_entry_block = allocator.iter_for(block); - last_entry_time = Time::now(); - pure_speed = true; - accurate_position = true; + travel_time = Time::zero; + if(!layout.get_driver().is_halted()) + { + pure_speed = true; + accurate_position = true; + } overshoot_dist = 0; - if(!advancing && vehicles.front()->get_track()) + if(!advancing && vehicles.front()->is_placed()) { TrackIter track = last_entry_block.track_iter(); if(reverse) { track = track.flip(); - vehicles.back()->place(track, 0, Vehicle::BACK_AXLE); + vehicles.back()->place(track, VehiclePlacement::BACK_AXLE); } else - vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE); + vehicles.front()->place(track, VehiclePlacement::FRONT_AXLE); + } + } + else if(BeamGate *gate = dynamic_cast(sensor)) + { + if(!advancing && vehicles.front()->is_placed()) + { + TrackIter track = allocator.iter_for(block).track_iter(); + for(; (track && &track->get_block()==&block); track=track.next()) + if(track.track()==gate->get_track()) + { + if(reverse) + track = track.reverse(); + float offset = gate->get_offset_from_endpoint(track.entry()); + if(reverse) + vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER); + else + vehicles.front()->place(TrackOffsetIter(track, offset), VehiclePlacement::FRONT_BUFFER); + break; + } } } } @@ -521,65 +542,45 @@ void Train::halt_event(bool h) accurate_position = false; } -float Train::get_reserved_distance_until(const Block *until_block, bool back) const +float Train::get_reserved_distance_until(const Block *until_block) const { if(allocator.empty()) return 0; - Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front()); - const VehicleType &vtype = veh.get_type(); + Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); - TrackIter track = veh.get_track_iter(); + TrackOffsetIter track = veh.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE); if(!track) // XXX Probably unnecessary return 0; - 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) + if(&track->get_block()==until_block) return 0; - if(back) - block = block.reverse(); - - float result = veh.get_offset(); - if(reverse!=back) + // Account for the vehicle's offset on its current track + float result = track.offset(); + if(reverse) track = track.reverse(); else - result = track->get_type().get_path_length(track->get_active_path())-result; - result -= vtype.get_length()/2; + result = track->get_path_length()-result; + result -= veh.get_type().get_length()/2; - while(1) - { - track = track.next(); - if(!track) - break; + BlockIter block = track.block_iter(); - if(!block->has_track(*track)) - { - if(back) - { - if(&*block==&*first) - break; - } - else - { - if(&*block==&*last) - break; - } - block = block.next(); + // Count remaining distance in the vehicle's current block + for(track=track.next(); &track->get_block()==&*block; track=track.next()) + result += track->get_path_length(); - if(&*block==until_block) - break; - } + const BlockIter &last = allocator.last(); + if(&*block==&*last) + return result; + + // Count any remaining blocks + for(block=block.next(); (&*block!=until_block && block->get_train()==this); block=block.next()) + { + result += block->get_path_length(block.entry()); - result += track->get_type().get_path_length(track->get_active_path()); + if(&*block==&*last) + break; } return result; @@ -605,7 +606,7 @@ void Train::Loader::finish() { TrackIter track = obj.allocator.first().track_iter(); float offset = 2*obj.layout.get_catalogue().get_scale(); - obj.vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER); + obj.vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER); } } @@ -634,15 +635,16 @@ void Train::Loader::router() void Train::Loader::timetable() { Timetable *ttbl = new Timetable(obj); - load_sub(*ttbl); + load_sub(*ttbl, obj.layout); } -void Train::Loader::vehicle(ArticleNumber art_nr) +void Train::Loader::vehicle(const string &n) { - const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr); + const VehicleType &vtype = obj.layout.get_catalogue().get(n); Vehicle *veh = new Vehicle(obj.layout, vtype); obj.vehicles.back()->attach_back(*veh); obj.vehicles.push_back(veh); + veh->set_train(&obj); } } // namespace R2C2