status("Unplaced"),
travel_dist(0),
pure_speed(false),
- real_speed(15)
+ real_speed(15),
+ accurate_position(false),
+ overshoot_dist(false)
{
vehicles.push_back(new Vehicle(layout, loco_type));
Train::~Train()
{
+ delete control;
+ delete timetable;
for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete *i;
layout.remove_train(*this);
release_blocks(cur_blocks);
set_active(false);
+ accurate_position = false;
if(!block.reserve(this))
{
stop_timeout = Time::TimeStamp();
}
+ Driver &driver = layout.get_driver();
+
if(timetable)
timetable->tick(t);
control->tick(dt);
if(speed && (speed<0)!=reverse)
{
- layout.get_driver().set_loco_reverse(address, speed<0);
+ driver.set_loco_reverse(address, speed<0);
reverse = speed<0;
release_blocks(rsv_blocks);
reserve_more();
}
- if(speed_notch!=current_speed && !speed_changing)
+ if(speed_notch!=current_speed && !speed_changing && !driver.is_halted() && driver.get_power())
{
speed_changing = true;
- layout.get_driver().set_loco_speed(address, speed_notch);
+ driver.set_loco_speed(address, speed_notch);
pure_speed = false;
for(list<BlockRef>::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
ok = i->block->get_tracks().count(track);
+ float d = get_real_speed(current_speed)*(dt/Time::sec);
if(ok)
- {
- float d = get_real_speed(current_speed)*(dt/Time::sec);
vehicle.advance(reverse ? -d : d);
+ else if(accurate_position)
+ {
+ overshoot_dist += d;
+ if(overshoot_dist>40*layout.get_catalogue().get_scale())
+ layout.emergency(name+" has not arrived at sensor");
}
}
else if(end_of_route)
void Train::save(list<DataFile::Statement> &st) const
{
st.push_back((DataFile::Statement("name"), name));
+
+ for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ if(i!=vehicles.begin())
+ st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+
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));
{
current_speed = speed;
speed_changing = false;
+ pure_speed = false;
}
}
{
// Find the first sensor block from our reserved blocks that isn't this sensor
list<BlockRef>::iterator i;
+ unsigned result = 0;
for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr)
- break;
+ if(i->block->get_sensor_id())
+ {
+ if(i->block->get_sensor_id()!=addr)
+ {
+ if(result==0)
+ result = 2;
+ else if(result==1)
+ break;
+ }
+ else if(result==0)
+ result = 1;
+ else if(result==2)
+ result = 3;
+ }
- if(i!=rsv_blocks.begin())
+ if(result==1 && i!=rsv_blocks.begin())
{
// Compute speed and update related state
float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
}
last_entry_time = Time::now();
pure_speed = true;
+ accurate_position = true;
+ overshoot_dist = 0;
// Check if we've reached the next route
if(next_route)
signal_arrived.emit();
}
}
+ else if(result==3)
+ layout.emergency("Sensor for "+name+" triggered out of order");
}
else
{
last = &rsv_blocks.back();
}
+ // Make any sensorless blocks at the beginning immediately current
+ list<BlockRef>::iterator i;
+ for(i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !i->block->get_sensor_id()); ++i) ;
+ if(i!=rsv_blocks.begin())
+ cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
+
return good_sens;
}
obj.cur_blocks.push_back(BlockRef(&blk, entry));
obj.set_status("Stopped");
const Block::Endpoint &bep = blk.get_endpoints()[entry];
- obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+ obj.vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
if(blk.get_sensor_id())
obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true);