X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=462ff1dff730318b18f35d049a540ccc16438d19;hb=a448b6ac73e0eb19980e69b095136eabe95d2534;hp=d7b422039ea71e43b740f619a59c33a03f9edd6a;hpb=39566dc89cdadf4f6e701a14b5d9049f22b591fb;p=r2c2.git diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp index d7b4220..462ff1d 100644 --- a/source/libmarklin/train.cpp +++ b/source/libmarklin/train.cpp @@ -11,6 +11,7 @@ Distributed under the GPL #include #include "control.h" #include "except.h" +#include "route.h" #include "tracktype.h" #include "trafficmanager.h" #include "train.h" @@ -18,20 +19,19 @@ Distributed under the GPL using namespace std; using namespace Msp; -#include - namespace Marklin { Train::Train(TrafficManager &tm, Locomotive &l): trfc_mgr(tm), loco(l), + pending_block(0), target_speed(0), + route(0), status("Unplaced"), 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); @@ -45,8 +45,8 @@ Train::Train(TrafficManager &tm, Locomotive &l): const map &turnouts = trfc_mgr.get_control().get_turnouts(); for(map::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i) { - i->second->signal_route_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_route_changing), i->second)); - i->second->signal_route_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_route_changed), i->second)); + i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second)); + i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second)); } } @@ -61,8 +61,7 @@ void Train::set_speed(unsigned speed) { if(speed==target_speed) return; - if(!target_speed && speed) - travel_speed = static_cast(round(speed*speed_scale*87*3.6/5))*5; + travel_speed = static_cast(round(get_real_speed(speed)*87*3.6/5))*5; target_speed = speed; if(!target_speed) @@ -84,6 +83,12 @@ void Train::set_reverse(bool rev) loco.set_reverse(rev); } +void Train::set_route(const Route *r) +{ + route = r; + signal_route_changed.emit(route); +} + void Train::place(Block *block, unsigned entry) { for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();) @@ -137,21 +142,18 @@ bool Train::free_block(Block *block) void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) { if(try_reserve && t>try_reserve) - { reserve_more(); - update_speed(); - } if(cur_track) { - unsigned route = 0; + unsigned path = 0; if(cur_track->get_turnout_id()) - route = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_route(); + path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path(); - offset += speed_scale*loco.get_speed()*(dt/Time::sec); - if(offset>cur_track->get_type().get_route_length(route)) + offset += get_real_speed(loco.get_speed())*(dt/Time::sec); + if(offset>cur_track->get_type().get_path_length(path)) { - int out = cur_track->traverse(cur_track_ep, route); + int out = cur_track->traverse(cur_track_ep, path); if(out>=0) { Track *next = cur_track->get_link(out); @@ -165,14 +167,16 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt) } if(cur_track) - pos = cur_track->get_point(cur_track_ep, route, offset); + pos = cur_track->get_point(cur_track_ep, path, offset); } } 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) @@ -184,7 +188,15 @@ void Train::locomotive_reverse_changed(bool) 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 path = 0; + if(unsigned turnout = cur_track->get_turnout_id()) + path = trfc_mgr.get_control().get_turnout(turnout).get_path(); + cur_track_ep = cur_track->traverse(cur_track_ep, path); + offset = cur_track->get_type().get_path_length(path)-offset; + } } void Train::sensor_event(bool state, Sensor *sensor) @@ -205,16 +217,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: "<block->get_sensor_id()==addr) set_position(i->block->get_endpoints()[i->entry]); - if(target_speed) - { - reserve_more(); + if(target_speed && reserve_more()<2) update_speed(); - } } else { @@ -255,12 +256,12 @@ void Train::sensor_event(bool state, Sensor *sensor) break; } - if(target_speed) + if(target_speed && pending_block && addr==pending_block->get_sensor_id()) reserve_more(); } } -void Train::turnout_route_changing(unsigned, Turnout *turnout) +void Train::turnout_path_changing(unsigned, Turnout *turnout) { unsigned tid = turnout->get_address(); for(list::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i) @@ -281,7 +282,7 @@ void Train::turnout_route_changing(unsigned, Turnout *turnout) } } -void Train::turnout_route_changed(unsigned, Turnout *turnout) +void Train::turnout_path_changed(unsigned, Turnout *turnout) { unsigned tid = turnout->get_address(); for(list::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) @@ -293,9 +294,11 @@ void Train::turnout_route_changed(unsigned, Turnout *turnout) i = rsv_blocks.erase(i); } reserve_more(); - update_speed(); return; } + + if(pending_block && tid==pending_block->get_turnout_id()) + reserve_more(); } unsigned Train::reserve_more() @@ -308,36 +311,50 @@ unsigned Train::reserve_more() if(!last) return 0; + pending_block = 0; + unsigned nsens = 0; for(list::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i) if(i->block->get_sensor_id()) ++nsens; - bool result = false; - while(nsens<2) + bool got_more = false; + while(nsens<3) { int exit = last->block->traverse(last->entry); - if(exit>=0) + if(exit<0) + break; + + Block *link = last->block->get_link(exit); + if(!link || !link->reserve(this)) { - Block *link = last->block->get_link(exit); - if(link && link->reserve(this)) + pending_block = link; + break; + } + + if(route && link->get_turnout_id()) + { + int path = route->get_turnout(link->get_turnout_id()); + Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id()); + if(path>=0 && path!=turnout.get_path()) { - rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block))); - last = &rsv_blocks.back(); - if(last->block->get_sensor_id()) - { - ++nsens; - result = true; - } - } - else + link->reserve(0); + pending_block = link; + turnout.set_path(path); break; + } + } + + rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block))); + last = &rsv_blocks.back(); + if(last->block->get_sensor_id()) + { + ++nsens; + got_more = true; } - else - break; } - while(last && !last->block->get_sensor_id()) + while(!rsv_blocks.empty() && !last->block->get_sensor_id()) { last->block->reserve(0); rsv_blocks.erase(--rsv_blocks.end()); @@ -347,6 +364,9 @@ unsigned Train::reserve_more() last = 0; } + if(got_more) + update_speed(); + return nsens; } @@ -365,6 +385,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); @@ -372,9 +393,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"); @@ -388,6 +409,62 @@ 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; + + unsigned low = 0; + unsigned high = 0; + for(unsigned i=0; (!high && i<=14); ++i) + if(real_speed[i].weight) + { + if(real_speed[i].speed(low*real/real_speed[low].speed), 14U); + } + + float f = (real-real_speed[low].speed)/(real_speed[high].speed-real_speed[low].speed); + return static_cast(low*(1-f)+high*f+0.5); +} + void Train::set_status(const string &s) { status = s; @@ -410,11 +487,29 @@ void Train::release_reserved_blocks() } +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