#include "locotype.h"
#include "route.h"
#include "simplephysics.h"
+#include "timetable.h"
#include "tracktype.h"
#include "train.h"
#include "vehicle.h"
layout(l),
loco_type(t),
address(a),
+ priority(0),
pending_block(0),
control(new AIControl(*this, new SimplePhysics)),
+ timetable(0),
active(false),
current_speed(0),
speed_changing(false),
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));
layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event));
+
+ layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
+
+ control->signal_control_changed.connect(signal_control_changed);
}
Train::~Train()
{
+ delete control;
+ delete timetable;
for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete *i;
layout.remove_train(*this);
signal_name_changed.emit(name);
}
+void Train::set_priority(int p)
+{
+ priority = p;
+}
+
Vehicle &Train::get_vehicle(unsigned i)
{
if(i>=vehicles.size())
void Train::set_control(const string &n, float v)
{
control->set_control(n, v);
- signal_control_changed.emit(n, control->get_control(n).value);
}
void Train::set_active(bool a)
return (functions>>func)&1;
}
+void Train::set_timetable(Timetable *tt)
+{
+ delete timetable;
+ timetable = tt;
+}
+
void Train::set_route(const Route *r)
{
if(!rsv_blocks.empty())
}
}
- if(active)
- reserve_more();
+ reserve_more();
signal_route_changed.emit(route);
}
release_blocks(cur_blocks);
set_active(false);
+ accurate_position = false;
if(!block.reserve(this))
{
const VehicleType &vtype = veh.get_type();
Track *track = veh.get_track();
+ if(!track)
+ return 0;
unsigned entry = veh.get_entry();
float result = -vtype.get_length()/2;
result += track->get_type().get_path_length(track->get_active_path());
first = false;
+ if(track->get_type().get_endpoints().size()<2)
+ return result;
+
unsigned exit = track->traverse(entry);
Track *next = track->get_link(exit);
stop_timeout = Time::TimeStamp();
}
+ Driver &driver = layout.get_driver();
+
+ if(timetable)
+ timetable->tick(t);
control->tick(dt);
float speed = control->get_speed();
unsigned speed_notch = find_speed(abs(speed));
- if(speed && (speed<0)!=reverse)
+ if(control->get_reverse()!=reverse)
{
- layout.get_driver().set_loco_reverse(address, speed<0);
- reverse = speed<0;
+ reverse = control->get_reverse();
+ driver.set_loco_reverse(address, reverse);
release_blocks(rsv_blocks);
reverse_blocks(cur_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;
if(!active)
set_active(true);
- Track *track = vehicles[0]->get_track();
+ Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
+ Track *track = vehicle.get_track();
bool ok = 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)
+ vehicle.advance(reverse ? -d : d);
+ else if(accurate_position)
{
- float d = get_real_speed(current_speed)*(dt/Time::sec);
- vehicles[0]->advance(reverse ? -d : d);
+ overshoot_dist += d;
+ if(overshoot_dist>40*layout.get_catalogue().get_scale())
+ {
+ layout.emergency(name+" has not arrived at sensor");
+ accurate_position = false;
+ }
}
}
else if(end_of_route)
set_route(0);
+
+ if(!cur_blocks.empty() && !cur_blocks.front().block->get_sensor_id())
+ {
+ Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
+
+ list<BlockRef>::iterator i = cur_blocks.begin();
+ const Block::Endpoint &bep = i->block->get_endpoints()[i->entry];
+
+ Track *track = bep.track;
+ unsigned entry = bep.track_ep;
+
+ bool found = false;
+ float dist = veh.get_offset()-veh.get_type().get_length()/2;
+ while(1)
+ {
+ if(track==veh.get_track())
+ {
+ found = true;
+ break;
+ }
+
+ if(i!=cur_blocks.begin())
+ {
+ float path_len = track->get_type().get_path_length(track->get_active_path());
+ dist += path_len;
+ }
+
+ unsigned exit = track->traverse(entry);
+ Track *next = track->get_link(exit);
+ entry = next->get_endpoint_by_link(*track);
+ track = next;
+
+ if(!i->block->get_tracks().count(track))
+ {
+ ++i;
+ if(i==cur_blocks.end())
+ break;
+ }
+ }
+
+ if(found && i!=cur_blocks.begin() && dist>10*layout.get_catalogue().get_scale())
+ {
+ cur_blocks.front().block->reserve(0);
+ cur_blocks.erase(cur_blocks.begin());
+ }
+ }
}
void Train::save(list<DataFile::Statement> &st) const
{
st.push_back((DataFile::Statement("name"), name));
+
+ st.push_back((DataFile::Statement("priority"), priority));
+
+ 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));
}
if(route)
- st.push_back((DataFile::Statement("route"), route->get_name()));
+ {
+ if(!route->is_temporary())
+ st.push_back((DataFile::Statement("route"), route->get_name()));
+ else if(next_route && !next_route->is_temporary())
+ st.push_back((DataFile::Statement("route"), next_route->get_name()));
+ }
+
+ if(timetable)
+ {
+ DataFile::Statement ss("timetable");
+ timetable->save(ss.sub);
+ st.push_back(ss);
+ }
}
void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
{
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;
if(pure_speed)
{
- RealSpeed &rs = real_speed[current_speed];
- rs.add(travel_dist/travel_time_secs, travel_time_secs);
+ if(current_speed)
+ {
+ RealSpeed &rs = real_speed[current_speed];
+ rs.add(travel_dist/travel_time_secs, travel_time_secs);
+ }
set_status(format("Traveling %d kmh", get_travel_speed()));
}
}
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
{
if(layout.get_driver().get_sensor(i->block->get_sensor_id()))
break;
else
+ {
end = i;
+ ++end;
+ }
}
if(end!=cur_blocks.begin())
- {
// Free blocks up to the last inactive sensor
- ++end;
release_blocks(cur_blocks, cur_blocks.begin(), end);
- }
}
}
}
}
+void Train::halt_event(bool h)
+{
+ if(h)
+ accurate_position = false;
+}
+
void Train::block_reserved(const Block &block, const Train *train)
{
if(&block==pending_block && !train)
unsigned Train::reserve_more()
{
+ if(!active)
+ return 0;
+
BlockRef *last = 0;
if(!rsv_blocks.empty())
last = &rsv_blocks.back();
unsigned good_sens = nsens;
while(good_sens<3)
{
+ if(last->block->get_endpoints().size()<2)
+ {
+ good = last;
+ good_sens = nsens;
+ break;
+ }
+
// Traverse to the next block
unsigned exit = last->block->traverse(last->entry);
Block *link = last->block->get_link(exit);
else if(route && route->get_tracks().count(entry_ep.track))
cur_route = route;
- if(!link->reserve(this))
+ bool reserved = link->reserve(this);
+ if(!reserved)
{
- // If we found another train and it's not headed straight for us, we can keep the blocks we got
- int other_entry = link->get_train()->get_entry_to_block(*link);
- if(other_entry<0)
- throw LogicError("Block reservation inconsistency");
- if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
+ // Ask a lesser priority train to free the block for us
+ if(link->get_train()->get_priority()<priority)
+ if(link->get_train()->free_block(*link))
+ reserved = link->reserve(this);
+
+ if(!reserved)
{
- good = last;
- good_sens = nsens;
+ // If we found another train and it's not headed straight for us, we can keep the blocks we got
+ int other_entry = link->get_train()->get_entry_to_block(*link);
+ if(other_entry<0)
+ throw LogicError("Block reservation inconsistency");
+ if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
+ {
+ good = last;
+ good_sens = nsens;
+ }
+ pending_block = link;
+ break;
}
- pending_block = link;
- break;
}
if(link->get_turnout_id())
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;
}
if(!high)
{
if(!low)
- return 0;
+ {
+ if(real)
+ return 3;
+ else
+ return 0;
+ }
return min(static_cast<unsigned>(low*real/real_speed[low].speed), 14U);
}
add("block", &Loader::block);
add("block_hint", &Loader::block_hint);
add("name", &Loader::name);
+ add("priority", &Train::priority);
add("real_speed", &Loader::real_speed);
add("route", &Loader::route);
+ add("timetable", &Loader::timetable);
+ add("vehicle", &Loader::vehicle);
}
void Train::Loader::block(unsigned id)
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);
obj.set_route(&obj.layout.get_route(n));
}
+void Train::Loader::timetable()
+{
+ if(obj.timetable)
+ throw InvalidState("A timetable has already been loaded");
+
+ obj.timetable = new Timetable(obj);
+ load_sub(*obj.timetable);
+}
+
+void Train::Loader::vehicle(unsigned n)
+{
+ const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(n);
+ Vehicle *veh = new Vehicle(obj.layout, vtype);
+ obj.vehicles.back()->attach_back(*veh);
+ obj.vehicles.push_back(veh);
+}
+
} // namespace Marklin
projects / r2c2.git / blobdiff