X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b1fbc6a76ebb1bf4ad02f85d981f465fef1a1759;hb=ecd7af790bd3ab7c7e768f68968379e1feea56a9;hp=285a15a27fb83794bcffa9406c144b416e1d0079;hpb=d41f66805bc9fe0b33e3d46b47f52e67b5782028;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index 285a15a..b1fbc6a 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -5,15 +5,14 @@ #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" @@ -21,7 +20,6 @@ #include "trainrouter.h" #include "vehicle.h" #include "vehicletype.h" -#include "zone.h" using namespace std; using namespace Msp; @@ -58,15 +56,16 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): 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_sensor_state_changed.connect(sigc::mem_fun(this, &Train::sensor_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() @@ -140,7 +139,7 @@ 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 @@ -161,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; @@ -185,21 +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"); - allocator.start_from(block); accurate_position = false; last_entry_block = BlockIter(); - 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() @@ -222,33 +241,53 @@ void Train::stop_at(Block *block) bool Train::is_block_critical(const Block &block) const { - return get_reserved_distance_until(&block)<=controller->get_braking_distance()*1.3; + if(allocator.is_block_current(block)) + return true; + + BlockIter i = check_critical_blocks(&block); + return i.block()==█ +} + +BlockIter Train::get_last_critical_block() const +{ + return check_critical_blocks(0); } -BlockIter Train::get_first_noncritical_block() const +BlockIter Train::check_critical_blocks(const Block *check) const { if(allocator.empty()) return BlockIter(); - BlockIter i = allocator.last_current().next(); + BlockIter i = allocator.last_current(); if(controller->get_speed()==0) 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; float dist = 0; bool sensor_seen = false; - for(; i->get_train()==this; i=i.next()) + i = i.next(); + while(i.block()!=last.block() && i.block()!=check) { - if(dist>min_dist && sensor_seen) - return i; - dist += i->get_path_length(i.entry()); - if(i->get_sensor_id()) + if(i->get_sensor_address()) sensor_seen = true; + + if(dist>min_dist && sensor_seen) + break; + + BlockIter j = i.next(); + if(j->get_train()!=this) + break; + + i = j; } return i; @@ -257,7 +296,7 @@ BlockIter Train::get_first_noncritical_block() const void Train::refresh_blocks_from(Block &block) { if(is_block_critical(block)) - allocator.rewind_to(*get_first_noncritical_block()); + allocator.rewind_to(*get_last_critical_block().next()); else allocator.rewind_to(block); } @@ -279,12 +318,9 @@ void Train::tick(const Time::TimeDelta &dt) { if(stop_timeout) { - stop_timeout -= dt; + stop_timeout = max(stop_timeout-dt, Time::zero); if(stop_timeout<=Time::zero) - { allocator.set_active(false); - stop_timeout = Time::TimeDelta(); - } } travel_time += dt; @@ -309,7 +345,7 @@ void Train::tick(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(); last_entry_block = BlockIter(); @@ -321,7 +357,7 @@ void Train::tick(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; } @@ -337,7 +373,8 @@ void Train::tick(const Time::TimeDelta &dt) 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); @@ -347,7 +384,7 @@ void Train::tick(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; } } @@ -362,9 +399,10 @@ 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) { @@ -388,6 +426,12 @@ void Train::save(list &st) const 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); + } } } @@ -396,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<get_train()!=this) + if(!sensor) return; - if(last_entry_block && &*last_entry_block!=block) - { - for(BlockIter i=last_entry_block.next(); (i && &*i!=block); i=i.next()) - if(i->get_train()!=this || i->get_sensor_id()) - return; - } - - if(dynamic_cast(&sensor)) + if(sensor==block.get_sensor()) { if(last_entry_block && pure_speed && speed_quantizer) { float travel_distance = 0; - for(BlockIter i=last_entry_block; &*i!=block; i=i.next()) + for(BlockIter i=last_entry_block; &*i!=█ i=i.next()) travel_distance += i->get_path_length(i.entry()); if(travel_distance>0) @@ -458,39 +494,42 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) } } - last_entry_block = allocator.iter_for(*block); + last_entry_block = allocator.iter_for(block); travel_time = Time::zero; - pure_speed = true; - accurate_position = true; + 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)) + else if(BeamGate *gate = dynamic_cast(sensor)) { - if(!advancing && vehicles.front()->get_track()) + if(!advancing && vehicles.front()->is_placed()) { - TrackIter track = allocator.iter_for(*block).track_iter(); - for(; (track && &track->get_block()==block); track=track.next()) + 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(track, offset, Vehicle::BACK_BUFFER); + vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER); else - vehicles.front()->place(track, offset, Vehicle::FRONT_BUFFER); + vehicles.front()->place(TrackOffsetIter(track, offset), VehiclePlacement::FRONT_BUFFER); break; } } @@ -510,7 +549,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); - TrackIter track = veh.get_track_iter().track_iter(); + TrackOffsetIter track = veh.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE); if(!track) // XXX Probably unnecessary return 0; @@ -518,18 +557,18 @@ float Train::get_reserved_distance_until(const Block *until_block) const return 0; // Account for the vehicle's offset on its current track - float result = veh.get_offset(); + float result = track.offset(); if(reverse) track = track.reverse(); else - result = track->get_type().get_path_length(track->get_active_path())-result; + result = track->get_path_length()-result; result -= veh.get_type().get_length()/2; BlockIter block = track.block_iter(); // Count remaining distance in the vehicle's current block for(track=track.next(); &track->get_block()==&*block; track=track.next()) - result += track->get_type().get_path_length(track->get_active_path()); + result += track->get_path_length(); const BlockIter &last = allocator.last(); if(&*block==&*last) @@ -557,6 +596,7 @@ Train::Loader::Loader(Train &t): add("name", &Loader::name); add("quantized_speed", &Loader::quantized_speed); add("router", &Loader::router); + add("timetable", &Loader::timetable); add("vehicle", &Loader::vehicle); } @@ -566,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); } } @@ -592,9 +632,15 @@ void Train::Loader::router() load_sub(*rtr); } -void Train::Loader::vehicle(ArticleNumber art_nr) +void Train::Loader::timetable() +{ + Timetable *ttbl = new Timetable(obj); + load_sub(*ttbl, obj.layout); +} + +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);