X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b2a49c722e7732938cfce5ed3cdefa95b5838d9b;hb=32739f060d1c025756b3ed702da1cbbdd6793064;hp=8cfa2d0ee4817158b11086ea318bdeef2c50db83;hpb=9f4f169affcedcf249e935f93e0a15ed60232f6a;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index 8cfa2d0..b2a49c7 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -36,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), @@ -54,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); @@ -88,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) @@ -96,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 @@ -126,23 +135,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::zero; - allocator.reserve_more(); - } - else - stop_timeout = 2*Time::sec; -} - void Train::set_function(unsigned func, bool state) { if(!loco_type.get_functions().count(func)) @@ -199,10 +191,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); @@ -216,8 +206,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) @@ -227,48 +215,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 @@ -284,19 +272,14 @@ 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::TimeDelta &dt) { - if(!active && stop_timeout) + if(stop_timeout) { stop_timeout -= dt; if(stop_timeout<=Time::zero) { - allocator.release_noncurrent(); + allocator.set_active(false); stop_timeout = Time::TimeDelta(); } } @@ -305,8 +288,14 @@ void Train::tick(const Time::TimeDelta &dt) Driver &driver = layout.get_driver(); + bool intent_to_move = false; for(list::iterator i=ais.begin(); i!=ais.end(); ++i) + { (*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; @@ -320,8 +309,6 @@ void Train::tick(const Time::TimeDelta &dt) driver.set_loco_reverse(address, r); allocator.reverse(); - if(active) - allocator.reserve_more(); } if(speed_quantizer) @@ -340,8 +327,8 @@ void Train::tick(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()); @@ -361,6 +348,10 @@ void Train::tick(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 @@ -431,13 +422,9 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state) void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) { - Block *block = 0; - if(TrackCircuit *tc = dynamic_cast(&sensor)) - block = &tc->get_block(); - else - return; + Block *block = sensor.get_block(); - if(block->get_train()==this && state==Sensor::MAYBE_ACTIVE) + if(block && block->get_train()==this && state==Sensor::MAYBE_ACTIVE) { if(last_entry_block) { @@ -499,8 +486,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const if(!track) // XXX Probably unnecessary return 0; - BlockIter block = track.block_iter(); - if(&*block==until_block) + if(&track->get_block()==until_block) return 0; // Account for the vehicle's offset on its current track @@ -511,6 +497,8 @@ float Train::get_reserved_distance_until(const Block *until_block) const result = track->get_type().get_path_length(track->get_active_path())-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()); @@ -582,6 +570,7 @@ void Train::Loader::vehicle(ArticleNumber 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