using namespace std;
using namespace Msp;
-#include <iostream>
-
namespace Marklin {
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);
const map<unsigned, Turnout *> &turnouts = trfc_mgr.get_control().get_turnouts();
for(map<unsigned, Turnout *>::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));
}
}
{
if(speed==target_speed)
return;
- if(!target_speed && speed)
- travel_speed = static_cast<int>(round(speed*speed_scale*87*3.6/5))*5;
+ travel_speed = static_cast<int>(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<BlockRef>::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();
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);
}
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<DataFile::Statement> &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)
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)
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: "<<speed_scale<<'x'<<speed_scale_weight<<" + "<<scale<<'x'<<weight<<'\n';
- speed_scale = (speed_scale*speed_scale_weight+scale*weight)/(speed_scale_weight+weight);
- speed_scale_weight += weight;
- cout<<" Result: "<<speed_scale<<'x'<<speed_scale_weight<<'\n';
- }
+ RealSpeed &rs = real_speed[loco.get_speed()];
+ rs.add(travel_dist/travel_time_secs, travel_time_secs);
}
travel_dist = 0;
else
{
for(list<BlockRef>::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<BlockRef>::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<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
+ j->block->reserve(0);
+ cur_blocks.erase(cur_blocks.begin(), i);
+ }
break;
}
}
}
-void Train::turnout_route_changing(unsigned, Turnout *turnout)
+void Train::turnout_path_changing(unsigned, Turnout *turnout)
{
unsigned tid = turnout->get_address();
for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
}
}
-void Train::turnout_route_changed(unsigned, Turnout *turnout)
+void Train::turnout_path_changed(unsigned, Turnout *turnout)
{
unsigned tid = turnout->get_address();
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
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);
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");
}
}
+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<real; ++high)
+ if(real_speed[high].weight)
+ low = high;
+
+ float f = (real-real_speed[low].speed)/(real_speed[high].speed-real_speed[low].speed);
+ return static_cast<unsigned>(low*(1-f)+high*f+0.5);
+}
+
void Train::set_status(const string &s)
{
status = s;
pos = cur_track->get_endpoint_position(cur_track_ep);
}
+void Train::release_reserved_blocks()
+{
+ for(list<BlockRef>::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<Train>(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
projects / r2c2.git / blobdiff