#include "catalogue.h"
#include "driver.h"
#include "layout.h"
-#include "locotype.h"
#include "route.h"
-#include "simplephysics.h"
+#include "simplecontroller.h"
#include "timetable.h"
#include "tracktype.h"
#include "train.h"
#include "vehicle.h"
+#include "vehicletype.h"
using namespace std;
using namespace Msp;
+namespace {
+
+struct SetFlag
+{
+ bool &flag;
+
+ SetFlag(bool &f): flag(f) { flag = true; }
+ ~SetFlag() { flag = false; }
+};
+
+}
+
+
namespace Marklin {
-Train::Train(Layout &l, const LocoType &t, unsigned a):
+Train::Train(Layout &l, const VehicleType &t, unsigned a):
layout(l),
loco_type(t),
address(a),
priority(0),
pending_block(0),
- control(new AIControl(*this, new SimplePhysics)),
+ reserving(false),
+ advancing(false),
+ controller(new AIControl(*this, new SimpleController)),
timetable(0),
active(false),
current_speed(0),
accurate_position(false),
overshoot_dist(false)
{
+ if(!loco_type.is_locomotive())
+ throw InvalidParameterValue("Initial vehicle must be a locomotive");
+
vehicles.push_back(new Vehicle(layout, loco_type));
layout.add_train(*this);
layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
- control->signal_control_changed.connect(signal_control_changed);
+ controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed));
}
Train::~Train()
{
- delete control;
+ delete controller;
delete timetable;
for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete *i;
priority = p;
}
+void Train::add_vehicle(const VehicleType &vt)
+{
+ Vehicle *veh = new Vehicle(layout, vt);
+ vehicles.back()->attach_back(*veh);
+ vehicles.push_back(veh);
+}
+
+void Train::remove_vehicle(unsigned i)
+{
+ if(i>=vehicles.size())
+ throw InvalidParameterValue("Vehicle index out of range");
+ if(i==0)
+ throw InvalidParameterValue("Can't remove the locomotive");
+ delete vehicles[i];
+ vehicles.erase(vehicles.begin()+i);
+ if(i<vehicles.size())
+ vehicles[i-1]->attach_back(*vehicles[i]);
+}
+
+unsigned Train::get_n_vehicles() const
+{
+ return vehicles.size();
+}
+
Vehicle &Train::get_vehicle(unsigned i)
{
if(i>=vehicles.size())
void Train::set_control(const string &n, float v)
{
- control->set_control(n, v);
+ controller->set_control(n, v);
}
void Train::set_active(bool a)
{
if(a==active)
return;
- if(!a && control->get_speed())
+ if(!a && controller->get_speed())
throw InvalidState("Can't deactivate while moving");
active = a;
layout.get_driver().set_loco_function(address+1, func-4, state);
}
+float Train::get_control(const string &ctrl) const
+{
+ return controller->get_control(ctrl).value;
+}
+
+float Train::get_speed() const
+{
+ return controller->get_speed();
+}
+
bool Train::get_function(unsigned func) const
{
return (functions>>func)&1;
next_route = 0;
end_of_route = false;
- if(route)
+ if(route && !cur_blocks.empty())
{
BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back());
BlockRef next = last.next();
void Train::place(Block &block, unsigned entry)
{
- if(control->get_speed())
+ if(controller->get_speed())
throw InvalidState("Must be stopped before placing");
release_blocks(rsv_blocks);
else
{
const Block::Endpoint &bep = block.get_endpoints()[entry];
- vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+ vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
}
}
float Train::get_reserved_distance() const
{
+ if(cur_blocks.empty())
+ return 0;
+
Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
const VehicleType &vtype = veh.get_type();
if(timetable)
timetable->tick(t);
- control->tick(dt);
- float speed = control->get_speed();
- unsigned speed_notch = find_speed(abs(speed));
+ controller->tick(dt);
+ float speed = controller->get_speed();
+ unsigned speed_notch = find_speed(speed);
- if(control->get_reverse()!=reverse)
+ if(controller->get_reverse()!=reverse)
{
- reverse = control->get_reverse();
+ reverse = controller->get_reverse();
driver.set_loco_reverse(address, reverse);
release_blocks(rsv_blocks);
float d = get_real_speed(current_speed)*(dt/Time::sec);
if(ok)
+ {
+ SetFlag setf(advancing);
vehicle.advance(reverse ? -d : d);
+ }
else if(accurate_position)
{
overshoot_dist += d;
}
}
}
- else if(end_of_route)
+ else if(end_of_route && rsv_blocks.empty())
+ {
+ signal_arrived.emit();
set_route(0);
+ }
if(!cur_blocks.empty() && !cur_blocks.front().block->get_sensor_id())
{
unsigned entry = bep.track_ep;
bool found = false;
- float dist = veh.get_offset()-veh.get_type().get_length()/2;
+ float dist = veh.get_offset();
+ if(reverse)
+ dist = veh.get_track()->get_type().get_path_length(veh.get_track()->get_active_path())-dist;
+ dist -= veh.get_type().get_length()/2;
while(1)
{
if(track==veh.get_track())
}
}
+void Train::control_changed(const Controller::Control &ctrl)
+{
+ signal_control_changed.emit(ctrl.name, ctrl.value);
+}
+
void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
{
if(addr==address)
j->block->traverse(j->entry, &block_len);
travel_dist += block_len;
- if(j->block->get_sensor_id()==addr)
+ if(j->block->get_sensor_id()==addr && !advancing)
{
const Block::Endpoint &bep = j->block->get_endpoints()[j->entry];
if(reverse)
// Try to get more blocks if we're moving
if(active)
- {
- unsigned nsens = reserve_more();
- if(!nsens && end_of_route)
- signal_arrived.emit();
- }
+ reserve_more();
}
else if(result==3)
layout.emergency("Sensor for "+name+" triggered out of order");
}
}
- if(end!=cur_blocks.begin())
+ if(end!=cur_blocks.begin() && end!=cur_blocks.end())
// Free blocks up to the last inactive sensor
release_blocks(cur_blocks, cur_blocks.begin(), end);
}
unsigned pending_addr = pending_block->get_turnout_id();
bool double_addr = (*pending_block->get_tracks().begin())->get_type().is_double_address();
if(addr==pending_addr || (double_addr && addr==pending_addr+1))
- reserve_more();
+ {
+ if(reserving)
+ pending_block = 0;
+ else
+ reserve_more();
+ }
}
}
}
}
+ SetFlag setf(reserving);
+
bool got_more = false;
BlockRef *good = last;
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->get_endpoints().size()<2)
+ {
+ good = last;
+ good_sens = nsens;
+ break;
+ }
+
bool reserved = link->reserve(this);
if(!reserved)
{
if(path!=static_cast<int>(entry_ep.track->get_active_path()))
{
// The turnout is set to wrong path - switch and wait for it
- link->reserve(0);
pending_block = link;
entry_ep.track->set_active_path(path);
- break;
+ if(pending_block)
+ {
+ link->reserve(0);
+ break;
+ }
}
}
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) ;
Train::Loader::Loader(Train &t):
DataFile::BasicLoader<Train>(t),
- prev_block(0)
+ prev_block(0),
+ blocks_valid(true)
{
add("block", &Loader::block);
add("block_hint", &Loader::block_hint);
add("vehicle", &Loader::vehicle);
}
+void Train::Loader::finish()
+{
+ if(!obj.cur_blocks.empty())
+ {
+ const BlockRef &blkref = obj.cur_blocks.front();
+ const Block::Endpoint &bep = blkref.block->get_endpoints()[blkref.entry];
+ obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+
+ obj.set_status("Stopped");
+ }
+}
+
void Train::Loader::block(unsigned id)
{
- Block &blk = obj.layout.get_block(id);
+ if(!blocks_valid)
+ return;
+
+ Block *blk;
+ try
+ {
+ blk = &obj.layout.get_block(id);
+ }
+ catch(const KeyError &)
+ {
+ blocks_valid = false;
+ return;
+ }
+
int entry = -1;
if(prev_block)
- entry = blk.get_endpoint_by_link(*prev_block);
+ entry = blk->get_endpoint_by_link(*prev_block);
if(entry<0)
entry = 0;
- blk.reserve(&obj);
- obj.cur_blocks.push_back(BlockRef(&blk, entry));
- obj.set_status("Stopped");
- const Block::Endpoint &bep = blk.get_endpoints()[entry];
- obj.vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+ blk->reserve(&obj);
+ obj.cur_blocks.push_back(BlockRef(blk, entry));
- if(blk.get_sensor_id())
- obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true);
+ if(blk->get_sensor_id())
+ obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true);
- prev_block = &blk;
+ prev_block = blk;
}
void Train::Loader::block_hint(unsigned id)
{
- prev_block = &obj.layout.get_block(id);
+ try
+ {
+ prev_block = &obj.layout.get_block(id);
+ }
+ catch(const KeyError &)
+ {
+ blocks_valid = false;
+ }
}
void Train::Loader::name(const string &n)
projects / r2c2.git / blobdiff