X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=9300267331c4e0c1f68c086f014ce5696605467b;hb=dcbe77ccf560aae2d10d645a02f6256fc0caf6f3;hp=341921aaf511000a406869cd78f0b566641ec420;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index 341921a..9300267 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -18,8 +18,6 @@ Distributed under the GPL using namespace std; using namespace Msp; -#include - namespace Marklin { Train::Train(TrafficManager &tm, Locomotive &l): @@ -30,12 +28,13 @@ Train::Train(TrafficManager &tm, Locomotive &l): travel_dist(0), travel_speed(0), pure_speed(false), - speed_scale(0.02), - speed_scale_weight(0), + real_speed(15), cur_track(0) { trfc_mgr.add_train(this); + loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed)); + const map &sensors = trfc_mgr.get_control().get_sensors(); for(map::const_iterator i=sensors.begin(); i!=sensors.end(); ++i) i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second)); @@ -57,24 +56,30 @@ void Train::set_name(const string &n) void Train::set_speed(unsigned speed) { - if(!target_speed && speed) - travel_speed = static_cast(round(speed*speed_scale*87*3.6/5))*5; + if(speed==target_speed) + return; + travel_speed = static_cast(round(get_real_speed(speed)*87*3.6/5))*5; target_speed = speed; if(!target_speed) { - // XXX We might roll onto a new sensor and get confused - should delay freeing blocks a bit - for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) - i->block->reserve(0); - rsv_blocks.clear(); + trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect( + sigc::bind_return(sigc::mem_fun(this, &Train::release_reserved_blocks), false)); } else reserve_more(); + signal_target_speed_changed.emit(target_speed); + update_speed(); pure_speed = false; } +void Train::set_reverse(bool rev) +{ + loco.set_reverse(rev); +} + void Train::place(Block *block, unsigned entry) { for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();) @@ -139,7 +144,7 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) if(cur_track->get_turnout_id()) route = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_route(); - offset += speed_scale*loco.get_speed()*(dt/Time::sec); + offset += get_real_speed(loco.get_speed())*(dt/Time::sec); if(offset>cur_track->get_type().get_route_length(route)) { int out = cur_track->traverse(cur_track_ep, route); @@ -163,7 +168,30 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) void Train::save(list &st) const { st.push_back((DataFile::Statement("name"), name)); - st.push_back((DataFile::Statement("speed_scale"), speed_scale, speed_scale_weight)); + for(unsigned i=0; i<=14; ++i) + if(real_speed[i].weight) + st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight)); +} + +void Train::locomotive_reverse_changed(bool) +{ + for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) + i->block->reserve(0); + rsv_blocks.clear(); + cur_blocks.reverse(); + for(list::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) + i->entry = i->block->traverse(i->entry); + reserve_more(); + update_speed(); + + if(cur_track) + { + unsigned route = 0; + if(unsigned turnout = cur_track->get_turnout_id()) + route = trfc_mgr.get_control().get_turnout(turnout).get_route(); + cur_track_ep = cur_track->traverse(cur_track_ep, route); + offset = cur_track->get_type().get_route_length(route)-offset; + } } void Train::sensor_event(bool state, Sensor *sensor) @@ -184,16 +212,8 @@ void Train::sensor_event(bool state, Sensor *sensor) if(pure_speed) { - float weight = loco.get_speed()*travel_dist; - if(weight) - { - weight *= weight; - float scale = travel_dist/travel_time_secs/loco.get_speed(); - cout<<"Updating speed_scale: "<::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) - if(i->block->get_sensor_id()==addr) + if(unsigned b_addr = i->block->get_sensor_id()) { - ++i; - for(list::iterator j=cur_blocks.begin(); j!=i; ++j) - j->block->reserve(0); - cur_blocks.erase(cur_blocks.begin(), i); + if(b_addr==addr) + { + ++i; + for(list::iterator j=cur_blocks.begin(); j!=i; ++j) + j->block->reserve(0); + cur_blocks.erase(cur_blocks.begin(), i); + } break; } @@ -341,6 +364,7 @@ void Train::update_speed() if(i->block->get_sensor_id()) ++nsens; + unsigned slow_speed = find_speed(0.1); // 31.3 km/h if(nsens==0) { loco.set_speed(0); @@ -348,9 +372,9 @@ void Train::update_speed() try_reserve = Time::now()+2*Time::sec; set_status("Blocked"); } - else if(nsens==1 && target_speed>3) + else if(nsens==1 && target_speed>slow_speed) { - loco.set_speed(3); + loco.set_speed(slow_speed); pure_speed = false; try_reserve = Time::now()+2*Time::sec; set_status("Slow"); @@ -364,6 +388,53 @@ void Train::update_speed() } } +float Train::get_real_speed(unsigned i) const +{ + if(real_speed[i].weight) + return real_speed[i].speed; + + unsigned low; + unsigned high; + for(low=i; low>0; --low) + if(real_speed[low].weight) + break; + for(high=i; high<14; ++high) + if(real_speed[high].weight) + break; + + if(real_speed[high].weight) + { + if(real_speed[low].weight) + { + float f = float(i-low)/(high-low); + return real_speed[low].speed*(1-f)+real_speed[high].speed*f; + } + else + return real_speed[high].speed*float(i)/high; + } + else if(real_speed[low].weight) + return real_speed[low].speed*float(i)/low; + else + return 0; +} + +unsigned Train::find_speed(float real) const +{ + if(real<=real_speed[0].speed) + return 0; + if(real>=real_speed[14].speed) + return 14; + + unsigned low = 0; + unsigned high = 0; + for(high=0; real_speed[high].speed(low*(1-f)+high*f+0.5); +} + void Train::set_status(const string &s) { status = s; @@ -378,12 +449,37 @@ void Train::set_position(const Block::Endpoint &bep) pos = cur_track->get_endpoint_position(cur_track_ep); } +void Train::release_reserved_blocks() +{ + for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) + i->block->reserve(0); + rsv_blocks.clear(); +} + + +Train::RealSpeed::RealSpeed(): + speed(0), + weight(0) +{ } + +void Train::RealSpeed::add(float s, float w) +{ + speed = (speed*weight+s*w)/(weight+w); + weight = min(weight+w, 300.0f); +} + Train::Loader::Loader(Train &t): DataFile::BasicLoader(t) { add("name", &Train::name); - add("speed_scale", &Train::speed_scale, &Train::speed_scale_weight); + add("real_speed", &Loader::real_speed); +} + +void Train::Loader::real_speed(unsigned i, float speed, float weight) +{ + obj.real_speed[i].speed = speed; + obj.real_speed[i].weight = weight; } } // namespace Marklin