/* $Id$
This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <msp/strings/formatter.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
-#include "control.h"
-#include "except.h"
+#include "aicontrol.h"
+#include "catalogue.h"
+#include "driver.h"
+#include "layout.h"
#include "route.h"
+#include "simplecontroller.h"
+#include "timetable.h"
#include "tracktype.h"
-#include "trafficmanager.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(TrafficManager &tm, Locomotive &l):
- trfc_mgr(tm),
- loco(l),
- target_speed(0),
+Train::Train(Layout &l, const VehicleType &t, unsigned a):
+ layout(l),
+ loco_type(t),
+ address(a),
+ priority(0),
+ yielding_to(0),
+ pending_block(0),
+ reserving(false),
+ advancing(false),
+ controller(new AIControl(*this, new SimpleController)),
+ timetable(0),
+ active(false),
+ current_speed(0),
+ speed_changing(false),
+ reverse(false),
+ functions(0),
+ end_of_route(false),
status("Unplaced"),
travel_dist(0),
- travel_speed(0),
pure_speed(false),
real_speed(15),
- cur_track(0)
+ accurate_position(false),
+ overshoot_dist(false)
{
- trfc_mgr.add_train(this);
+ if(!loco_type.is_locomotive())
+ throw InvalidParameterValue("Initial vehicle must be a locomotive");
- loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed));
+ vehicles.push_back(new Vehicle(layout, loco_type));
- const map<unsigned, Sensor *> &sensors = trfc_mgr.get_control().get_sensors();
- for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
- i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second));
+ layout.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_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));
- }
+ layout.get_driver().add_loco(address);
+ layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
+ layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
+
+ 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));
+
+ controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed));
+}
+
+Train::~Train()
+{
+ delete controller;
+ delete timetable;
+ for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ delete *i;
+ layout.remove_train(*this);
}
void Train::set_name(const string &n)
signal_name_changed.emit(name);
}
-void Train::set_speed(unsigned speed)
+void Train::set_priority(int p)
+{
+ priority = p;
+}
+
+void Train::yield_to(const Train &t)
+{
+ yielding_to = &t;
+}
+
+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(speed==target_speed)
+ if(i>=vehicles.size())
+ throw InvalidParameterValue("Vehicle index out of range");
+ return *vehicles[i];
+}
+
+const Vehicle &Train::get_vehicle(unsigned i) const
+{
+ if(i>=vehicles.size())
+ throw InvalidParameterValue("Vehicle index out of range");
+ return *vehicles[i];
+}
+
+void Train::set_control(const string &n, float v)
+{
+ controller->set_control(n, v);
+}
+
+void Train::set_active(bool a)
+{
+ if(a==active)
return;
- travel_speed = static_cast<int>(round(get_real_speed(speed)*87*3.6/5))*5;
+ if(!a && controller->get_speed())
+ throw InvalidState("Can't deactivate while moving");
- target_speed = speed;
- if(!target_speed)
+ active = a;
+ if(active)
{
- trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
- sigc::bind_return(sigc::mem_fun(this, &Train::release_reserved_blocks), false));
+ stop_timeout = Time::TimeStamp();
+ reserve_more();
}
else
- reserve_more();
+ {
+ stop_timeout = Time::now()+2*Time::sec;
+ set_status("Stopped");
+ }
+}
- signal_target_speed_changed.emit(target_speed);
+void Train::set_function(unsigned func, bool state)
+{
+ if(!loco_type.get_functions().count(func))
+ throw InvalidParameterValue("Invalid function");
+ if(func<5)
+ layout.get_driver().set_loco_function(address, func, state);
+ else
+ 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();
+}
- update_speed();
- pure_speed = false;
+bool Train::get_function(unsigned func) const
+{
+ return (functions>>func)&1;
}
-void Train::set_reverse(bool rev)
+void Train::set_timetable(Timetable *tt)
{
- loco.set_reverse(rev);
+ delete timetable;
+ timetable = tt;
}
void Train::set_route(const Route *r)
{
- route = r;
- signal_route_changed.emit(route);
+ free_noncritical_blocks();
+
+ routes.clear();
+ if(r)
+ routes.push_back(r);
+ end_of_route = false;
+
+ if(r && !cur_blocks.empty())
+ {
+ BlockRef &first = cur_blocks.front();
+ BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back());
+ BlockRef next = last.next();
+ const Block::Endpoint &first_ep = first.block->get_endpoints()[first.entry];
+ const Block::Endpoint &next_ep = next.block->get_endpoints()[next.entry];
+ if(!r->has_track(*next_ep.track))
+ {
+ Route *lead = Route::find(*next_ep.track, next_ep.track_ep, *r);
+ create_lead_route(lead, lead);
+ routes.push_front(lead);
+ }
+ else if(!r->has_track(*first_ep.track))
+ routes.push_front(create_lead_route(0, r));
+ }
+
+ reserve_more();
+
+ signal_route_changed.emit(get_route());
+}
+
+void Train::go_to(Track &to)
+{
+ for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(i->block->has_track(to))
+ {
+ signal_arrived.emit();
+ set_route(0);
+ return;
+ }
+
+ free_noncritical_blocks();
+
+ BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back());
+ BlockRef next = last.next();
+ const Block::Endpoint &ep = next.block->get_endpoints()[next.entry];
+
+ Route *route = Route::find(*ep.track, ep.track_ep, to);
+ create_lead_route(route, route);
+ set_route(route);
}
-void Train::place(Block *block, unsigned entry)
+bool Train::divert(Track &from)
{
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();)
+ if(!from.get_turnout_id())
+ throw InvalidParameterValue("Can't divert from a non-turnout");
+ if(routes.empty())
+ return false;
+
+ int path = -1;
+ unsigned from_ep = 0;
+ list<RouteRef>::iterator route = routes.begin();
+ Block *block = cur_blocks.back().block;
+ unsigned entry = cur_blocks.back().entry;
+ set<const Track *> visited;
+
+ // Follow our routes to find out where we're entering the turnout
+ while(1)
{
- i->block->reserve(0);
- i = rsv_blocks.erase(i);
+ Block *link = block->get_link(block->traverse(entry, route->route));
+ entry = link->get_endpoint_by_link(*block);
+ block = link;
+
+ const Block::Endpoint &entry_ep = block->get_endpoints()[entry];
+
+ if(visited.count(entry_ep.track))
+ return false;
+ visited.insert(entry_ep.track);
+
+ if(!advance_route(route, *entry_ep.track))
+ return false;
+
+ if(entry_ep.track==&from)
+ {
+ if(block->get_train()==this && !free_block(*block))
+ return false;
+
+ from_ep = entry_ep.track_ep;
+ path = route->route->get_turnout(from.get_turnout_id());
+ break;
+ }
}
- for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end();)
+ // Check that more than one path is available
+ unsigned ep_paths = from.get_type().get_endpoints()[from_ep].paths;
+ if(!(ep_paths&(ep_paths-1)))
+ return false;
+
+ // Choose some other path
+ for(int i=0; ep_paths>>i; ++i)
+ if((ep_paths&(1<<i)) && i!=path)
+ {
+ path = i;
+ break;
+ }
+
+ Track *track = from.get_link(from.traverse(from_ep, path));
+ if(!track)
+ return false;
+
+ unsigned ep = track->get_endpoint_by_link(from);
+
+ set<Track *> tracks;
+ for(list<RouteRef>::iterator i=routes.begin(); i!=routes.end(); ++i)
+ tracks.insert(i->route->get_tracks().begin(), i->route->get_tracks().end());
+ Route *diversion = 0;
+ try
+ {
+ diversion = Route::find(*track, ep, tracks);
+ }
+ catch(const Msp::Exception &)
+ {
+ return false;
+ }
+
+ diversion->set_name("Diversion");
+ diversion->add_track(from);
+ diversion->set_turnout(from.get_turnout_id(), path);
+
+ if(!is_valid_diversion(*diversion, from, from_ep))
{
- i->block->reserve(0);
- i = cur_blocks.erase(i);
+ delete diversion;
+ return false;
}
- if(!block->reserve(this))
+ // Follow the diversion route until we get back to the original route
+ list<RouteRef>::iterator end = routes.end();
+ while(1)
+ {
+ path = 0;
+ if(track->get_turnout_id())
+ path = diversion->get_turnout(track->get_turnout_id());
+ Track *next = track->get_link(track->traverse(ep, path));
+
+ for(list<RouteRef>::iterator i=route; (end==routes.end() && i!=routes.end()); ++i)
+ if(i->route->has_track(*next))
+ end = i;
+
+ if(end!=routes.end())
+ break;
+ else if(!diversion->has_track(*next))
+ throw Exception("Pathfinder returned a bad route");
+
+ ep = next->get_endpoint_by_link(*track);
+ track = next;
+ }
+
+ if(route==end)
+ // We are rejoining the same route we diverted from, duplicate it
+ routes.insert(end, *route);
+ else
+ {
+ ++route;
+ routes.erase(route, end);
+ }
+ routes.insert(end, RouteRef(diversion, from.get_turnout_id()));
+
+ return true;
+}
+
+const Route *Train::get_route() const
+{
+ if(routes.empty())
+ return 0;
+ return routes.front().route;
+}
+
+void Train::place(Block &block, unsigned entry)
+{
+ if(controller->get_speed())
+ throw InvalidState("Must be stopped before placing");
+
+ release_blocks(rsv_blocks);
+ release_blocks(cur_blocks);
+
+ set_active(false);
+ accurate_position = false;
+
+ if(!block.reserve(this))
{
set_status("Unplaced");
return;
}
- cur_blocks.push_back(BlockRef(block, entry));
- set_position(block->get_endpoints()[entry]);
+ cur_blocks.push_back(BlockRef(&block, entry));
+ if(reverse)
+ {
+ unsigned exit = block.traverse(entry);
+ const Block::Endpoint &bep = block.get_endpoints()[exit];
+ Track *track = bep.track->get_link(bep.track_ep);
+ unsigned ep = track->get_endpoint_by_link(*bep.track);
+ vehicles.front()->place(*track, ep, 0, Vehicle::FRONT_BUFFER);
+ }
+ else
+ {
+ const Block::Endpoint &bep = block.get_endpoints()[entry];
+ vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+ }
+}
+
+void Train::unplace()
+{
+ if(controller->get_speed())
+ throw InvalidState("Must be stopped before unplacing");
+
+ release_blocks(rsv_blocks);
+ release_blocks(cur_blocks);
- set_status("Stopped");
+ set_active(false);
+ accurate_position = false;
+
+ for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ (*i)->unplace();
+
+ set_status("Unplaced");
}
-bool Train::free_block(Block *block)
+bool Train::free_block(Block &block)
{
+ float margin = 10*layout.get_catalogue().get_scale();
+ if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3+margin)
+ return false;
+
unsigned nsens = 0;
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
{
- if(i->block==block)
+ if(i->block==&block)
{
if(nsens<1)
return false;
- while(i!=rsv_blocks.end())
- {
- i->block->reserve(0);
- i = rsv_blocks.erase(i);
- }
- update_speed();
+ release_blocks(rsv_blocks, i, rsv_blocks.end());
return true;
}
else if(i->block->get_sensor_id())
return false;
}
+void Train::free_noncritical_blocks()
+{
+ if(cur_blocks.empty() || rsv_blocks.empty())
+ return;
+
+ if(controller->get_speed()==0)
+ {
+ release_blocks(rsv_blocks);
+ return;
+ }
+
+ float margin = 10*layout.get_catalogue().get_scale();
+ float min_dist = controller->get_braking_distance()*1.3+margin;
+
+ Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
+
+ Track *track = veh.get_track();
+ list<BlockRef>::iterator block = cur_blocks.begin();
+ bool in_rsv = false;
+ while(block!=rsv_blocks.end() && !block->block->has_track(*track))
+ {
+ ++block;
+ if(block==cur_blocks.end())
+ {
+ block = rsv_blocks.begin();
+ in_rsv = true;
+ }
+ }
+
+ unsigned entry = veh.get_entry();
+ float dist = veh.get_offset();
+ if(reverse)
+ entry = track->traverse(entry);
+ else
+ dist = track->get_type().get_path_length(track->get_active_path())-dist;
+ dist -= veh.get_type().get_length()/2;
+
+ bool nsens = 0;
+ while(1)
+ {
+ Track *next = track->get_link(track->traverse(entry));
+ entry = next->get_endpoint_by_link(*track);
+ track = next;
+
+ if(!block->block->has_track(*track))
+ {
+ ++block;
+ if(block==cur_blocks.end())
+ {
+ block = rsv_blocks.begin();
+ in_rsv = true;
+ }
+ if(block==rsv_blocks.end())
+ return;
+
+ if(dist>min_dist && nsens>0)
+ {
+ release_blocks(rsv_blocks, block, rsv_blocks.end());
+ return;
+ }
+
+ if(in_rsv && block->block->get_sensor_id())
+ ++nsens;
+ }
+
+ dist += track->get_type().get_path_length(track->get_active_path());
+ }
+}
+
+int Train::get_entry_to_block(Block &block) const
+{
+ for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(i->block==&block)
+ return i->entry;
+ for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(i->block==&block)
+ return i->entry;
+ return -1;
+}
+
+float Train::get_reserved_distance() const
+{
+ return get_reserved_distance_until(0, false);
+}
+
void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
{
- if(try_reserve && t>try_reserve)
+ if(!active && stop_timeout && t>=stop_timeout)
{
+ release_blocks(rsv_blocks);
+ end_of_route = false;
+ stop_timeout = Time::TimeStamp();
+ }
+
+ Driver &driver = layout.get_driver();
+
+ if(timetable)
+ timetable->tick(t);
+ controller->tick(dt);
+ float speed = controller->get_speed();
+ unsigned speed_notch = find_speed(speed);
+
+ if(controller->get_reverse()!=reverse)
+ {
+ reverse = controller->get_reverse();
+ driver.set_loco_reverse(address, reverse);
+
+ release_blocks(rsv_blocks);
+ reverse_blocks(cur_blocks);
+
reserve_more();
- update_speed();
+ }
+ if(speed_notch!=current_speed && !speed_changing && !driver.is_halted() && driver.get_power())
+ {
+ speed_changing = true;
+ driver.set_loco_speed(address, speed_notch);
+
+ pure_speed = false;
+
+ if(speed_notch)
+ set_status(format("Traveling %d kmh", get_travel_speed()));
+ else
+ set_status("Waiting");
}
- if(cur_track)
+ if(speed)
{
- unsigned path = 0;
- if(cur_track->get_turnout_id())
- path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path();
+ if(!active)
+ set_active(true);
+
+ 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->has_track(*track);
- offset += get_real_speed(loco.get_speed())*(dt/Time::sec);
- if(offset>cur_track->get_type().get_path_length(path))
+ float d = get_real_speed(current_speed)*(dt/Time::sec);
+ if(ok)
{
- int out = cur_track->traverse(cur_track_ep, path);
- if(out>=0)
+ SetFlag setf(advancing);
+ vehicle.advance(reverse ? -d : d);
+ }
+ else if(accurate_position)
+ {
+ overshoot_dist += d;
+ if(overshoot_dist>40*layout.get_catalogue().get_scale())
{
- Track *next = cur_track->get_link(out);
- if(next)
- cur_track_ep = next->get_endpoint_by_link(*cur_track);
- cur_track = next;
- offset = 0;
+ layout.emergency(name+" has not arrived at sensor");
+ accurate_position = false;
}
- else
- cur_track = 0;
}
+ }
+ else if(end_of_route && rsv_blocks.empty())
+ {
+ set_active(false);
+ signal_arrived.emit();
+ set_route(0);
+ }
- if(cur_track)
- pos = cur_track->get_point(cur_track_ep, path, offset);
+ if(!cur_blocks.empty() && !cur_blocks.front().block->get_sensor_id())
+ {
+ float dist = get_reserved_distance_until(cur_blocks.front().block, true);
+
+ if(dist>10*layout.get_catalogue().get_scale())
+ {
+ cur_blocks.front().block->reserve(0);
+ cur_blocks.pop_front();
+ }
}
}
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(!cur_blocks.empty())
+ {
+ list<BlockRef> blocks = cur_blocks;
+ if(reverse)
+ reverse_blocks(blocks);
+
+ Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link;
+ st.push_back((DataFile::Statement("block_hint"), prev->get_id()));
+
+ for(list<BlockRef>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ st.push_back((DataFile::Statement("block"), i->block->get_id()));
+ }
+
+ if(!routes.empty())
+ {
+ list<RouteRef>::const_iterator i = routes.begin();
+ for(; (i!=routes.end() && i->route->is_temporary()); ++i) ;
+ if(i!=routes.end())
+ st.push_back((DataFile::Statement("route"), i->route->get_name()));
+ }
+
+ if(timetable)
+ {
+ DataFile::Statement ss("timetable");
+ timetable->save(ss.sub);
+ st.push_back(ss);
+ }
}
-void Train::locomotive_reverse_changed(bool)
+void Train::control_changed(const Controller::Control &ctrl)
{
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- i->block->reserve(0);
- rsv_blocks.clear();
- cur_blocks.reverse();
- for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- i->entry = i->block->traverse(i->entry);
- reserve_more();
- update_speed();
+ signal_control_changed.emit(ctrl.name, ctrl.value);
+}
- if(cur_track)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
+{
+ if(addr==address)
{
- 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;
+ current_speed = speed;
+ speed_changing = false;
+ pure_speed = false;
}
}
-void Train::sensor_event(bool state, Sensor *sensor)
+void Train::loco_func_event(unsigned addr, unsigned func, bool state)
{
- unsigned addr = sensor->get_address();
+ if(addr==address || (addr==address+1 && loco_type.get_max_function()>4))
+ {
+ if(addr==address+1)
+ func += 4;
+ if(state)
+ functions |= 1<<func;
+ else
+ functions &= ~(1<<func);
+ signal_function_changed.emit(func, state);
+ }
+}
+
+void Train::sensor_event(unsigned addr, bool state)
+{
if(state)
{
+ // 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;
- travel_speed = static_cast<int>(round(travel_dist/travel_time_secs*87*3.6/5))*5;
if(pure_speed)
{
- RealSpeed &rs = real_speed[loco.get_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()));
}
travel_dist = 0;
{
j->block->traverse(j->entry, &block_len);
travel_dist += block_len;
+
+ if(j->block->get_sensor_id()==addr && !advancing)
+ {
+ const Block::Endpoint &bep = j->block->get_endpoints()[j->entry];
+ if(reverse)
+ {
+ Track *track = bep.track->get_link(bep.track_ep);
+ unsigned ep = track->get_endpoint_by_link(*bep.track);
+ vehicles.back()->place(*track, ep, 0, Vehicle::BACK_AXLE);
+ }
+ else
+ vehicles.front()->place(*bep.track, bep.track_ep, 0, Vehicle::FRONT_AXLE);
+ }
}
last_entry_time = Time::now();
pure_speed = true;
+ accurate_position = true;
+ overshoot_dist = 0;
- cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
- }
+ // Check if we've reached the next route
+ if(routes.size()>1)
+ {
+ const set<Track *> &rtracks = (++routes.begin())->route->get_tracks();
+ for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
+ if(rtracks.count(j->block->get_endpoints()[j->entry].track))
+ {
+ routes.pop_front();
+ // XXX Exceptions?
+ signal_route_changed.emit(routes.front().route);
+ break;
+ }
+ }
- for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(i->block->get_sensor_id()==addr)
- set_position(i->block->get_endpoints()[i->entry]);
+ // Move blocks up to the next sensor to our current blocks
+ cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
- if(target_speed)
- {
- reserve_more();
- update_speed();
+ // Try to get more blocks if we're moving
+ if(active)
+ reserve_more();
}
+ else if(result==3)
+ layout.emergency("Sensor for "+name+" triggered out of order");
}
else
{
+ const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
+
+ // Find the first sensor in our current blocks that's still active
+ list<BlockRef>::iterator end = cur_blocks.begin();
for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(unsigned b_addr = i->block->get_sensor_id())
+ {
+ if(i->block->has_track(*veh.get_track()))
+ break;
+ if(i->block->get_sensor_id())
{
- if(b_addr==addr)
+ if(layout.get_driver().get_sensor(i->block->get_sensor_id()))
+ break;
+ else
{
- ++i;
- for(list<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
- j->block->reserve(0);
- cur_blocks.erase(cur_blocks.begin(), i);
+ end = i;
+ ++end;
}
- break;
}
-
- if(target_speed)
- reserve_more();
+ }
+
+ 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);
}
}
-void Train::turnout_path_changing(unsigned, Turnout *turnout)
+void Train::turnout_event(unsigned addr, bool)
{
- unsigned tid = turnout->get_address();
- for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(i->block->get_turnout_id()==tid)
- throw TurnoutBusy(this);
-
- unsigned nsens = 0;
- for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(pending_block && (!pending_block->get_train() || pending_block->get_train()==this))
{
- if(i->block->get_turnout_id()==tid)
+ 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))
{
- if(nsens<1)
- throw TurnoutBusy(this);
- break;
+ if(reserving)
+ pending_block = 0;
+ else
+ reserve_more();
}
- else if(i->block->get_sensor_id())
- ++nsens;
}
}
-void Train::turnout_path_changed(unsigned, Turnout *turnout)
+void Train::halt_event(bool h)
{
- unsigned tid = turnout->get_address();
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- if(i->block->get_turnout_id()==tid)
- {
- while(i!=rsv_blocks.end())
- {
- i->block->reserve(0);
- i = rsv_blocks.erase(i);
- }
- reserve_more();
- update_speed();
- return;
- }
+ if(h)
+ accurate_position = false;
+}
+
+void Train::block_reserved(const Block &block, const Train *train)
+{
+ if(&block==pending_block && !train && !reserving)
+ reserve_more();
}
unsigned Train::reserve_more()
{
- BlockRef *last = 0;
+ if(!active)
+ return 0;
+
+ BlockRef *start = 0;
if(!rsv_blocks.empty())
- last = &rsv_blocks.back();
+ start = &rsv_blocks.back();
else if(!cur_blocks.empty())
- last = &cur_blocks.back();
- if(!last)
+ start = &cur_blocks.back();
+ if(!start)
return 0;
+ pending_block = 0;
+
+ // See how many sensor blocks and how much track we already have
unsigned nsens = 0;
+ float dist = 0;
for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ {
if(i->block->get_sensor_id())
++nsens;
+ if(nsens>0)
+ {
+ float length = 0;
+ i->block->traverse(i->entry, &length);
+ dist += length;
+ }
+ }
+
+ if(end_of_route)
+ return nsens;
- bool result = false;
- while(nsens<2)
+ list<RouteRef>::iterator cur_route = routes.begin();
+ advance_route(cur_route, *start->block->get_endpoints()[start->entry].track);
+
+ float approach_margin = 50*layout.get_catalogue().get_scale();
+ float min_dist = controller->get_braking_distance()*1.3+approach_margin*2;
+
+ BlockRef *last = start;
+ BlockRef *good = start;
+ Track *divert_track = 0;
+ bool try_divert = false;
+ unsigned good_sens = nsens;
+ float good_dist = dist;
+ Train *blocking_train = 0;
+ std::list<BlockRef> contested_blocks;
+
+ SetFlag setf(reserving);
+
+ while(good_sens<3 || good_dist<min_dist || !contested_blocks.empty())
{
- int exit = last->block->traverse(last->entry);
- if(exit<0)
+ // Traverse to the next block
+ float length = 0;
+ Block *link = 0;
+ {
+ const Route *route = (cur_route!=routes.end() ? cur_route->route : 0);
+ unsigned exit = last->block->traverse(last->entry, route, &length);
+ link = last->block->get_link(exit);
+ }
+ if(!link)
break;
- Block *link = last->block->get_link(exit);
- if(!link || !link->reserve(this))
+ int entry = link->get_endpoint_by_link(*last->block);
+ if(entry<0)
+ throw LogicError("Block links are inconsistent!");
+
+ const Block::Endpoint &entry_ep = link->get_endpoints()[entry];
+
+ if(cur_route!=routes.end())
+ {
+ if(!advance_route(cur_route, *entry_ep.track))
+ {
+ // Keep the blocks if we arrived at the end of the route
+ if(!blocking_train)
+ {
+ good = last;
+ good_sens = nsens;
+ good_dist = dist;
+ end_of_route = true;
+ }
+ break;
+ }
+ }
+ else if(!routes.empty() && routes.front().route->has_track(*entry_ep.track))
+ cur_route = routes.begin();
+
+ if(link->get_endpoints().size()<2)
+ {
+ if(!blocking_train)
+ {
+ good = last;
+ good_sens = nsens;
+ good_dist = dist;
+ }
break;
+ }
+
+ if(blocking_train)
+ {
+ if(link->get_train()!=blocking_train)
+ {
+ if(blocking_train->free_block(*contested_blocks.back().block))
+ {
+ // Roll back and start actually reserving the blocks
+ last = &rsv_blocks.back();
+ cur_route = routes.begin();
+ advance_route(cur_route, *last->block->get_endpoints()[last->entry].track);
+ if(blocking_train->get_priority()==priority)
+ blocking_train->yield_to(*this);
+ blocking_train = 0;
+ continue;
+ }
+ else
+ {
+ yield_to(*blocking_train);
+ pending_block = contested_blocks.front().block;
+ try_divert = divert_track;
+ break;
+ }
+ }
+ else
+ {
+ contested_blocks.push_back(BlockRef(link, entry));
+ last = &contested_blocks.back();
+ continue;
+ }
+ }
- if(route && link->get_turnout_id())
+ bool reserved = link->reserve(this);
+ if(!reserved)
{
- int path = route->get_turnout(link->get_turnout_id());
- if(path>=0)
- trfc_mgr.get_control().get_turnout(link->get_turnout_id()).set_path(path);
+ /* We've found another train. If it wants to exit the block from the
+ same endpoint we're trying to enter from or the other way around,
+ treat it as coming towards us. Otherwise treat it as going in the
+ same direction. */
+ Train *other_train = link->get_train();
+ int other_entry = other_train->get_entry_to_block(*link);
+ if(other_entry<0)
+ throw LogicError("Block reservation inconsistency");
+
+ bool entry_conflict = (static_cast<unsigned>(entry)==link->traverse(other_entry));
+ bool exit_conflict = (link->traverse(entry)==static_cast<unsigned>(other_entry));
+ if(!entry_conflict && !last->block->get_turnout_id())
+ {
+ /* The other train is not coming to the blocks we're holding, so we
+ can keep them. */
+ good = last;
+ good_sens = nsens;
+ good_dist = dist;
+ }
+
+ int other_prio = other_train->get_priority();
+
+ if(!entry_conflict && !exit_conflict && other_prio<priority)
+ {
+ /* Ask a lesser priority train going to the same direction to free
+ the block for us */
+ if(other_train->free_block(*link))
+ reserved = link->reserve(this);
+ }
+ else if(other_train!=yielding_to && (other_prio<priority || (other_prio==priority && entry_conflict)))
+ {
+ /* A lesser priority train is coming at us, we must ask it to free
+ enough blocks to get clear of it to avoid a potential deadlock */
+ blocking_train = other_train;
+ contested_blocks.clear();
+ contested_blocks.push_back(BlockRef(link, entry));
+ last = &contested_blocks.back();
+ continue;
+ }
+ else if(divert_track && (entry_conflict || exit_conflict))
+ // We are blocked, but there's a diversion possibility
+ try_divert = true;
+
+ if(!reserved)
+ {
+ pending_block = link;
+ break;
+ }
}
- rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
+
+ if(link->get_turnout_id())
+ {
+ const Endpoint &track_ep = entry_ep.track->get_type().get_endpoints()[entry_ep.track_ep];
+ bool multiple_paths = (track_ep.paths&(track_ep.paths-1));
+
+ if(multiple_paths || !last->block->get_turnout_id())
+ {
+ /* We can keep the blocks reserved so far if we are facing the
+ points or if there was no turnout immediately before this one.
+ With multiple successive turnouts (as is common in crossovers) it's
+ best to hold at one we can divert from. */
+ good = last;
+ good_sens = nsens;
+ good_dist = dist;
+ }
+
+ // Figure out what path we'd like to take on the turnout
+ int path = -1;
+ for(list<RouteRef>::iterator i=cur_route; (path<0 && i!=routes.end()); ++i)
+ path = i->route->get_turnout(link->get_turnout_id());
+ if(path<0)
+ path = entry_ep.track->get_active_path();
+ if(!(track_ep.paths&(1<<path)))
+ {
+ for(unsigned i=0; track_ep.paths>>i; ++i)
+ if(track_ep.paths&(1<<i))
+ path = i;
+ }
+
+ if(path!=static_cast<int>(entry_ep.track->get_active_path()))
+ {
+ // The turnout is set to wrong path - switch and wait for it
+ pending_block = link;
+ entry_ep.track->set_active_path(path);
+ if(pending_block)
+ {
+ link->reserve(0);
+ break;
+ }
+ }
+
+ if(multiple_paths && cur_route!=routes.end() && cur_route->diversion!=link->get_turnout_id())
+ /* There's multiple paths to be taken and we are on a route - take
+ note of the diversion possibility */
+ divert_track = entry_ep.track;
+ }
+
+ if(!contested_blocks.empty() && contested_blocks.front().block==link)
+ contested_blocks.pop_front();
+
+ rsv_blocks.push_back(BlockRef(link, entry));
last = &rsv_blocks.back();
if(last->block->get_sensor_id())
- {
++nsens;
- result = true;
- }
+ if(nsens>0)
+ dist += length;
}
- while(!rsv_blocks.empty() && !last->block->get_sensor_id())
+ // Unreserve blocks that were not good
+ while(!rsv_blocks.empty() && &rsv_blocks.back()!=good)
{
- last->block->reserve(0);
- rsv_blocks.erase(--rsv_blocks.end());
- if(!rsv_blocks.empty())
- last = &rsv_blocks.back();
- else
- last = 0;
+ rsv_blocks.back().block->reserve(0);
+ rsv_blocks.pop_back();
}
- return nsens;
+ if(!rsv_blocks.empty() && &rsv_blocks.back()!=start)
+ // We got some new blocks, so no longer need to yield
+ yielding_to = 0;
+
+ // 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);
+
+ if(try_divert && divert(*divert_track))
+ return reserve_more();
+
+ return good_sens;
}
-void Train::update_speed()
+float Train::get_reserved_distance_until(const Block *until_block, bool back) const
{
- if(!target_speed)
+ if(cur_blocks.empty())
+ return 0;
+
+ Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
+ const VehicleType &vtype = veh.get_type();
+
+ Track *track = veh.get_track();
+ if(!track)
+ return 0;
+
+ list<BlockRef>::const_iterator block = cur_blocks.begin();
+ while(block!=rsv_blocks.end() && !block->block->has_track(*track))
{
- loco.set_speed(0);
- try_reserve = Time::TimeStamp();
- set_status("Stopped");
+ ++block;
+ if(block==cur_blocks.end())
+ {
+ if(back)
+ return 0;
+ block = rsv_blocks.begin();
+ }
}
+ if(block==rsv_blocks.end() || block->block==until_block)
+ return 0;
+
+ unsigned entry = veh.get_entry();
+
+ float result = veh.get_offset();
+ if(reverse!=back)
+ entry = track->traverse(entry);
else
+ result = track->get_type().get_path_length(track->get_active_path())-result;
+ result -= vtype.get_length()/2;
+
+ while(1)
{
- unsigned nsens = 0;
- for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- if(i->block->get_sensor_id())
- ++nsens;
+ if(track->get_type().get_endpoints().size()<2)
+ break;
- unsigned slow_speed = find_speed(0.1); // 31.3 km/h
- if(nsens==0)
- {
- loco.set_speed(0);
- pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
- set_status("Blocked");
- }
- else if(nsens==1 && target_speed>slow_speed)
- {
- loco.set_speed(slow_speed);
- pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
- set_status("Slow");
- }
- else
+ Track *next = track->get_link(track->traverse(entry));
+
+ if(!block->block->has_track(*next))
{
- loco.set_speed(target_speed);
- try_reserve = Time::TimeStamp();
- set_status(format("Traveling %d kmh", travel_speed));
+ if(back)
+ {
+ if(block==cur_blocks.begin())
+ break;
+ --block;
+ }
+ else
+ {
+ ++block;
+ if(block==cur_blocks.end())
+ block = rsv_blocks.begin();
+ if(block==rsv_blocks.end())
+ break;
+ }
+
+ if(block->block==until_block)
+ break;
}
+
+ entry = next->get_endpoint_by_link(*track);
+ track = next;
+
+ result += track->get_type().get_path_length(track->get_active_path());
}
+
+ return result;
}
float Train::get_real_speed(unsigned i) const
unsigned low = 0;
unsigned high = 0;
+ unsigned last = 0;
for(unsigned i=0; (!high && i<=14); ++i)
if(real_speed[i].weight)
{
+ last = i;
if(real_speed[i].speed<real)
low = i;
else
if(!high)
{
if(!low)
- return 0;
- return min(static_cast<unsigned>(low*real/real_speed[low].speed), 14U);
+ {
+ if(real)
+ return 3;
+ else
+ return 0;
+ }
+ return min(min(static_cast<unsigned>(low*real/real_speed[low].speed), 14U), last+3);
}
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);
}
+float Train::get_travel_speed() const
+{
+ float speed = get_real_speed(current_speed);
+ float scale = layout.get_catalogue().get_scale();
+ return static_cast<int>(round(speed/scale*3.6/5))*5;
+}
+
void Train::set_status(const string &s)
{
status = s;
signal_status_changed.emit(s);
}
-void Train::set_position(const Block::Endpoint &bep)
+void Train::release_blocks(list<BlockRef> &blocks)
{
- cur_track = bep.track;
- cur_track_ep = bep.track_ep;
- offset = 0;
- pos = cur_track->get_endpoint_position(cur_track_ep);
+ release_blocks(blocks, blocks.begin(), blocks.end());
}
-void Train::release_reserved_blocks()
+void Train::release_blocks(list<BlockRef> &blocks, list<BlockRef>::iterator begin, list<BlockRef>::iterator end)
{
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- i->block->reserve(0);
- rsv_blocks.clear();
+ while(begin!=end)
+ {
+ Block *block = begin->block;
+ blocks.erase(begin++);
+ block->reserve(0);
+ }
}
+void Train::reverse_blocks(list<BlockRef> &blocks) const
+{
+ blocks.reverse();
+ for(list<BlockRef>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ i->entry = i->block->traverse(i->entry);
+}
+
+bool Train::advance_route(list<RouteRef>::iterator &iter, Track &track)
+{
+ while(iter!=routes.end() && !iter->route->has_track(track))
+ ++iter;
+ if(iter==routes.end())
+ return false;
+
+ list<RouteRef>::iterator next = iter;
+ ++next;
+ if(next!=routes.end() && next->diversion && next->route->has_track(track))
+ iter = next;
+
+ return true;
+}
+
+Route *Train::create_lead_route(Route *lead, const Route *target)
+{
+ if(!lead)
+ {
+ lead = new Route(layout);
+ lead->set_name("Lead");
+ lead->set_temporary(true);
+ }
+
+ set<Track *> tracks;
+ for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=rsv_blocks.end(); )
+ {
+ const set<Track *> &btracks = i->block->get_tracks();
+ for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
+ if(!target || !target->has_track(**j))
+ tracks.insert(*j);
+
+ if(++i==cur_blocks.end())
+ i = rsv_blocks.begin();
+ }
+
+ lead->add_tracks(tracks);
+
+ return lead;
+}
+
+bool Train::is_valid_diversion(const Route &diversion, Track &from, unsigned from_ep)
+{
+ float diversion_len = 0;
+ Track *track = &from;
+ unsigned ep = from_ep;
+ while(diversion.has_track(*track))
+ {
+ unsigned path = 0;
+ if(track->get_turnout_id())
+ path = diversion.get_turnout(track->get_turnout_id());
+ diversion_len += track->get_type().get_path_length(path);
+
+ Track *next = track->get_link(track->traverse(ep, path));
+ ep = next->get_endpoint_by_link(*track);
+ track = next;
+
+ if(track==&from)
+ return false;
+ }
+
+ list<RouteRef>::iterator route = routes.begin();
+ if(!advance_route(route, from))
+ return false;
+
+ set<Track *> visited;
+ float route_len = 0;
+ track = &from;
+ ep = from_ep;
+ while(1)
+ {
+ unsigned path = 0;
+ if(track->get_turnout_id())
+ path = route->route->get_turnout(track->get_turnout_id());
+ route_len += track->get_type().get_path_length(path);
+
+ if(track!=&from && diversion.has_track(*track))
+ break;
+
+ if(visited.count(track))
+ return false;
+ visited.insert(track);
+
+ Track *next = track->get_link(track->traverse(ep, path));
+ ep = next->get_endpoint_by_link(*track);
+ track = next;
+
+ if(!advance_route(route, *track))
+ return false;
+ }
+
+ return diversion_len<route_len*1.2;
+}
+
+
+Train::BlockRef::BlockRef(Block *b, unsigned e):
+ block(b),
+ entry(e)
+{ }
+
+Train::BlockRef Train::BlockRef::next() const
+{
+ Block *blk = block->get_endpoints()[block->traverse(entry)].link;
+ if(!blk)
+ throw InvalidState("At end of line");
+
+ int ep = blk->get_endpoint_by_link(*block);
+ if(ep<0)
+ throw LogicError("Block links are inconsistent");
+
+ return BlockRef(blk, ep);
+}
+
+
+Train::RouteRef::RouteRef(const Route *r, unsigned d):
+ route(r),
+ diversion(d)
+{ }
+
Train::RealSpeed::RealSpeed():
speed(0),
Train::Loader::Loader(Train &t):
- DataFile::BasicLoader<Train>(t)
+ DataFile::BasicLoader<Train>(t),
+ prev_block(0),
+ blocks_valid(true)
{
- add("name", &Train::name);
+ 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::finish()
+{
+ if(!obj.cur_blocks.empty())
+ {
+ const BlockRef &blkref = obj.cur_blocks.front();
+ const Block::Endpoint &bep = blkref.block->get_endpoints()[blkref.entry];
+ float offset = 2*obj.layout.get_catalogue().get_scale();
+ obj.vehicles.back()->place(*bep.track, bep.track_ep, offset, Vehicle::BACK_BUFFER);
+
+ obj.set_status("Stopped");
+ }
+}
+
+void Train::Loader::block(unsigned 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);
+ if(entry<0)
+ entry = 0;
+
+ 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);
+
+ prev_block = blk;
+}
+
+void Train::Loader::block_hint(unsigned id)
+{
+ try
+ {
+ prev_block = &obj.layout.get_block(id);
+ }
+ catch(const KeyError &)
+ {
+ blocks_valid = false;
+ }
+}
+
+void Train::Loader::name(const string &n)
+{
+ obj.set_name(n);
}
void Train::Loader::real_speed(unsigned i, float speed, float weight)
obj.real_speed[i].weight = weight;
}
+void Train::Loader::route(const string &n)
+{
+ 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