X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=8cfa2d0ee4817158b11086ea318bdeef2c50db83;hb=9f4f169affcedcf249e935f93e0a15ed60232f6a;hp=72714d730032094f5ae5419c24ffdef38a13ff1e;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index 72714d7..8cfa2d0 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -6,13 +6,14 @@ #include #include #include "aicontrol.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" @@ -40,7 +41,6 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p): speed_changing(false), reverse(false), functions(0), - travel_dist(0), pure_speed(false), speed_quantizer(0), accurate_position(false), @@ -61,7 +61,7 @@ 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_state_changed.connect(sigc::mem_fun(this, &Train::block_state_changed)); + 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)); @@ -136,11 +136,11 @@ void Train::set_active(bool a) active = a; if(active) { - stop_timeout = Time::TimeStamp(); + stop_timeout = Time::zero; allocator.reserve_more(); } else - stop_timeout = Time::now()+2*Time::sec; + stop_timeout = 2*Time::sec; } void Train::set_function(unsigned func, bool state) @@ -233,7 +233,7 @@ void Train::stop_at(Block *block) bool Train::free_block(Block &block) { - if(get_reserved_distance_until(&block, false)get_braking_distance()*1.3) + if(get_reserved_distance_until(&block)get_braking_distance()*1.3) return false; return allocator.release_from(block); @@ -253,53 +253,21 @@ void Train::free_noncritical_blocks() 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)) - { - if(&*block==&*last_cur) - in_rsv = true; - if(&*block==&*last) - break; - block = block.next(); - } - - 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; - - bool nsens = 0; - while(1) + BlockIter i = allocator.last_current().next(); + float dist = 0; + bool sensor_seen = false; + for(; i->get_train()==this; i=i.next()) { - track = track.next(); - - if(!block->has_track(*track)) + if(dist>min_dist && sensor_seen) { - if(&*block==&*last_cur) - in_rsv = true; - if(&*block==&*last) - return; - block = block.next(); - - if(dist>min_dist && nsens>0) - { - allocator.release_from(*block); - return; - } - - if(in_rsv && block->get_sensor_id()) - ++nsens; + allocator.release_from(*i); + return; } - dist += track->get_type().get_path_length(track->get_active_path()); + dist += i->get_path_length(i.entry()); + + if(i->get_sensor_id()) + sensor_seen = true; } } @@ -313,7 +281,7 @@ 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() @@ -321,18 +289,24 @@ void Train::reserve_more() allocator.reserve_more(); } -void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) +void Train::tick(const Time::TimeDelta &dt) { - if(!active && stop_timeout && t>=stop_timeout) + if(!active && stop_timeout) { - allocator.release_noncurrent(); - stop_timeout = Time::TimeStamp(); + stop_timeout -= dt; + if(stop_timeout<=Time::zero) + { + allocator.release_noncurrent(); + stop_timeout = Time::TimeDelta(); + } } + travel_time += dt; + Driver &driver = layout.get_driver(); for(list::iterator i=ais.begin(); i!=ais.end(); ++i) - (*i)->tick(t, dt); + (*i)->tick(dt); controller->tick(dt); float speed = controller->get_speed(); bool moving = speed>0; @@ -370,20 +344,9 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) set_active(true); 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(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) + if(allocator.is_block_current(vehicle.get_track()->get_block())) { SetFlag setf(advancing); vehicle.advance(reverse ? -d : d); @@ -398,14 +361,6 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) } } } - - 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()); - } } void Train::save(list &st) const @@ -438,12 +393,6 @@ 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); - } } } @@ -480,54 +429,55 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state) } } -void Train::block_state_changed(Block &block, Block::State state) +void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) { - if(state==Block::MAYBE_ACTIVE) + Block *block = 0; + if(TrackCircuit *tc = dynamic_cast(&sensor)) + block = &tc->get_block(); + else + return; + + if(block->get_train()==this && state==Sensor::MAYBE_ACTIVE) { - const BlockIter &first = allocator.first(); - const BlockIter &last_cur = allocator.last_current(); - bool valid = false; - for(BlockIter i=first; !valid; i=i.next()) + if(last_entry_block) { - if(&*i==&block) - valid = true; - if(&*i==&*last_cur) - break; - } + float travel_distance = -1; + if(pure_speed && speed_quantizer && current_speed_step>0) + travel_distance = 0; - if(valid) - { - // Compute speed and update related state - float travel_time_secs = (Time::now()-last_entry_time)/Time::sec; + for(BlockIter i=last_entry_block; &*i!=block; i=i.next()) + { + if(i->get_sensor_id()) + return; + if(travel_distance>=0) + travel_distance += i->get_path_length(i.entry()); + } - if(pure_speed && speed_quantizer && current_speed_step>0 && travel_time_secs>=2) - speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs); + if(travel_distance>0) + { + float travel_time_secs = travel_time/Time::sec; - travel_dist = 0; - unsigned entry = allocator.get_entry_to_block(block); - for(BlockIter i(&block, entry);; i=i.next()) + if(travel_time_secs>=2) + speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs); + } + } + + last_entry_block = allocator.iter_for(*block); + travel_time = Time::zero; + pure_speed = true; + accurate_position = true; + overshoot_dist = 0; + + if(!advancing && vehicles.front()->get_track()) + { + TrackIter track = last_entry_block.track_iter(); + if(reverse) { - travel_dist += i->get_path_length(i.entry()); - - if(&*i==&block && !advancing && vehicles.front()->get_track()) - { - TrackIter track = i.track_iter(); - if(reverse) - { - track = track.flip(); - vehicles.back()->place(track, 0, Vehicle::BACK_AXLE); - } - else - vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE); - } - - if(i==last_cur) - break; + track = track.flip(); + vehicles.back()->place(track, 0, Vehicle::BACK_AXLE); } - last_entry_time = Time::now(); - pure_speed = true; - accurate_position = true; - overshoot_dist = 0; + else + vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE); } } } @@ -538,65 +488,44 @@ 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(); 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(); - } + BlockIter block = track.block_iter(); if(&*block==until_block) return 0; - if(back) - block = block.reverse(); - + // Account for the vehicle's offset on its current track float result = veh.get_offset(); - if(reverse!=back) + if(reverse) track = track.reverse(); else result = track->get_type().get_path_length(track->get_active_path())-result; - result -= vtype.get_length()/2; + result -= veh.get_type().get_length()/2; - while(1) - { - track = track.next(); - if(!track) - break; + // 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()); - if(!block->has_track(*track)) - { - if(back) - { - if(&*block==&*first) - break; - } - else - { - if(&*block==&*last) - break; - } - block = block.next(); + const BlockIter &last = allocator.last(); + if(&*block==&*last) + return result; - if(&*block==until_block) - break; - } + // 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; @@ -612,7 +541,6 @@ 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); } @@ -648,12 +576,6 @@ void Train::Loader::router() load_sub(*rtr); } -void Train::Loader::timetable() -{ - Timetable *ttbl = new Timetable(obj); - load_sub(*ttbl); -} - void Train::Loader::vehicle(ArticleNumber art_nr) { const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr);