X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=e8df4d890ced6478c2e083776be81f9bc58564eb;hb=4529bf980cf3558d86c07266de7d890d3f5e06a6;hp=91387d85297e7f2a6b5bed13a1b620cf01f687b9;hpb=5c1ddd2f213af3fea15237e02f7da112c0abba36;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index 91387d8..e8df4d8 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" @@ -35,7 +36,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,6 +53,7 @@ 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); @@ -60,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)); @@ -87,6 +88,7 @@ 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); } void Train::remove_vehicle(unsigned i) @@ -125,23 +127,6 @@ 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)) @@ -198,10 +183,8 @@ void Train::place(const BlockIter &block) if(controller->get_speed()) throw logic_error("moving"); - set_active(false); - accurate_position = false; - allocator.start_from(block); + accurate_position = false; if(reverse) vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER); @@ -215,8 +198,6 @@ void Train::unplace() throw logic_error("moving"); allocator.clear(); - - set_active(false); accurate_position = false; for(vector::iterator i=vehicles.begin(); i!=vehicles.end(); ++i) @@ -226,48 +207,48 @@ 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)get_braking_distance()*1.3) - return false; - - return allocator.release_from(block); + return get_reserved_distance_until(&block)get_braking_distance()*1.3; } -void Train::free_noncritical_blocks() +BlockIter Train::get_first_noncritical_block() const { if(allocator.empty()) - return; + return BlockIter(); + + BlockIter i = allocator.last_current().next(); if(controller->get_speed()==0) - { - allocator.release_noncurrent(); - return; - } + return i; float margin = 10*layout.get_catalogue().get_scale(); float min_dist = controller->get_braking_distance()*1.3+margin; - BlockIter i = allocator.last_current().next(); float dist = 0; bool sensor_seen = false; for(; i->get_train()==this; i=i.next()) { if(dist>min_dist && sensor_seen) - { - allocator.release_from(*i); - return; - } + return i; dist += i->get_path_length(i.entry()); if(i->get_sensor_id()) sensor_seen = true; } + + return i; +} + +void Train::refresh_blocks_from(Block &block) +{ + if(is_block_critical(block)) + allocator.rewind_to(*get_first_noncritical_block()); + else + allocator.rewind_to(block); } float Train::get_reserved_distance() const @@ -283,23 +264,30 @@ float Train::get_reserved_distance() const return max(get_reserved_distance_until(0)-margin, 0.0f); } -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(stop_timeout) { - allocator.release_noncurrent(); - stop_timeout = Time::TimeStamp(); + stop_timeout -= dt; + if(stop_timeout<=Time::zero) + { + allocator.set_active(false); + stop_timeout = Time::TimeDelta(); + } } + 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; @@ -313,8 +301,6 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) driver.set_loco_reverse(address, r); allocator.reverse(); - if(active) - allocator.reserve_more(); } if(speed_quantizer) @@ -333,8 +319,8 @@ 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()); @@ -354,6 +340,10 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) } } } + 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 @@ -386,12 +376,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); - } } } @@ -428,9 +412,15 @@ 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(block.get_train()==this && 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) { if(last_entry_block) { @@ -438,7 +428,7 @@ void Train::block_state_changed(Block &block, Block::State state) if(pure_speed && speed_quantizer && current_speed_step>0) travel_distance = 0; - for(BlockIter i=last_entry_block; &*i!=█ i=i.next()) + for(BlockIter i=last_entry_block; &*i!=block; i=i.next()) { if(i->get_sensor_id()) return; @@ -448,15 +438,15 @@ void Train::block_state_changed(Block &block, Block::State state) 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); } } - last_entry_block = allocator.iter_for(block); - last_entry_time = Time::now(); + last_entry_block = allocator.iter_for(*block); + travel_time = Time::zero; pure_speed = true; accurate_position = true; overshoot_dist = 0; @@ -534,7 +524,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); } @@ -570,18 +559,13 @@ 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); Vehicle *veh = new Vehicle(obj.layout, vtype); obj.vehicles.back()->attach_back(*veh); obj.vehicles.push_back(veh); + veh->set_train(&obj); } } // namespace R2C2