/* $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 "driver.h"
#include "layout.h"
+#include "locotype.h"
#include "route.h"
#include "tracktype.h"
-#include "trafficmanager.h"
#include "train.h"
+#include "vehicle.h"
using namespace std;
using namespace Msp;
namespace Marklin {
-Train::Train(TrafficManager &tm, Locomotive &l):
- trfc_mgr(tm),
- loco(l),
+Train::Train(Layout &l, const LocoType &t, unsigned a):
+ layout(l),
+ loco_type(t),
+ address(a),
pending_block(0),
target_speed(0),
+ current_speed(0),
+ reverse(false),
+ functions(0),
route(0),
+ next_route(0),
+ end_of_route(false),
status("Unplaced"),
travel_dist(0),
travel_speed(0),
pure_speed(false),
- real_speed(15),
- cur_track(0)
+ real_speed(15)
{
- trfc_mgr.add_train(this);
+ vehicles.push_back(new Vehicle(layout, loco_type));
- loco.signal_reverse_changed.connect(sigc::mem_fun(this, &Train::locomotive_reverse_changed));
+ layout.add_train(*this);
- 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.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));
- 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.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));
+}
- trfc_mgr.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
+Train::~Train()
+{
+ 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);
}
+Vehicle &Train::get_vehicle(unsigned i)
+{
+ 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_speed(unsigned speed)
{
if(speed==target_speed)
if(!target_speed)
{
pending_block = 0;
- trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
- sigc::bind_return(sigc::bind(
- sigc::mem_fun(this, static_cast<void (Train::*)(list<BlockRef> &)>(&Train::release_blocks)),
- sigc::ref(rsv_blocks)), false));
+ stop_timeout = Time::now()+(800+current_speed*150)*Time::msec;
}
else
reserve_more();
void Train::set_reverse(bool rev)
{
- loco.set_reverse(rev);
+ if(rev==reverse)
+ return;
+
+ if(target_speed)
+ {
+ set_speed(0);
+ return;
+ }
+ else if(stop_timeout)
+ return;
+
+ layout.get_driver().set_loco_reverse(address, rev);
+
+ release_blocks(rsv_blocks);
+ reverse_blocks(cur_blocks);
+
+ // XXX Do something about the vehicles
+}
+
+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);
+}
+
+bool Train::get_function(unsigned func) const
+{
+ return (functions>>func)&1;
}
void Train::set_route(const Route *r)
{
+ if(!rsv_blocks.empty())
+ {
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(i->block->get_sensor_id())
+ {
+ release_blocks(rsv_blocks, ++i, rsv_blocks.end());
+ break;
+ }
+ }
+
route = r;
+ next_route = 0;
+ end_of_route = false;
+
+ if(route)
+ {
+ 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];
+ if(!route->get_tracks().count(ep.track))
+ {
+ next_route = route;
+ route = Route::find(*ep.track, ep.track_ep, *next_route);
+ }
+ }
+
+ if(target_speed && reserve_more()<2)
+ update_speed();
+
signal_route_changed.emit(route);
}
+void Train::go_to(const Track &to)
+{
+ for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ if(i->block->get_tracks().count(const_cast<Track *>(&to)))
+ {
+ set_speed(0);
+ set_route(0);
+ return;
+ }
+
+ BlockRef *last = 0;
+ if(rsv_blocks.empty())
+ last = &cur_blocks.back();
+ else
+ {
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !last); ++i)
+ if(i->block->get_sensor_id())
+ last = &*i;
+ }
+
+ BlockRef next = last->next();
+ const Block::Endpoint &ep = next.block->get_endpoints()[next.entry];
+
+ set_route(Route::find(*ep.track, ep.track_ep, to));
+}
+
void Train::place(Block &block, unsigned entry)
{
if(target_speed)
return -1;
}
-void Train::tick(const Time::TimeStamp &, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
{
- if(cur_track)
+ if(stop_timeout && t>=stop_timeout)
{
- unsigned path = 0;
- if(cur_track->get_turnout_id())
- path = trfc_mgr.get_control().get_turnout(cur_track->get_turnout_id()).get_path();
-
- offset += get_real_speed(loco.get_speed())*(dt/Time::sec);
- float path_len = cur_track->get_type().get_path_length(path);
- if(offset>path_len)
- {
- unsigned out = cur_track->traverse(cur_track_ep, path);
- Track *next = cur_track->get_link(out);
+ release_blocks(rsv_blocks);
+ end_of_route = false;
+ stop_timeout = Time::TimeStamp();
+ }
- bool ok = false;
- for(list<BlockRef>::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
- ok = i->block->get_tracks().count(next);
+ if(current_speed)
+ {
+ Track *track = vehicles[0]->get_track();
- if(ok)
- {
- if(next)
- cur_track_ep = next->get_endpoint_by_link(*cur_track);
- cur_track = next;
- offset = 0;
- }
- else
- offset = path_len-0.001;
- }
+ 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);
- if(cur_track)
- pos = cur_track->get_point(cur_track_ep, path, offset);
+ if(ok)
+ vehicles[0]->advance(get_real_speed(current_speed)*(dt/Time::sec));
}
}
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(!cur_blocks.empty())
{
list<BlockRef> blocks = cur_blocks;
- if(loco.get_reverse())
+ if(reverse)
reverse_blocks(blocks);
Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link;
for(list<BlockRef>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
st.push_back((DataFile::Statement("block"), i->block->get_id()));
}
+
+ if(route)
+ st.push_back((DataFile::Statement("route"), route->get_name()));
}
-void Train::locomotive_reverse_changed(bool)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
{
- release_blocks(rsv_blocks);
- reverse_blocks(cur_blocks);
- reserve_more();
-
- if(cur_track)
+ 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;
+ reverse = rev;
+
+ signal_speed_changed.emit(current_speed);
+ signal_reverse_changed.emit(reverse);
}
}
-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
if(pure_speed)
{
- RealSpeed &rs = real_speed[loco.get_speed()];
+ RealSpeed &rs = real_speed[current_speed];
rs.add(travel_dist/travel_time_secs, travel_time_secs);
}
last_entry_time = Time::now();
pure_speed = true;
+ // Check if we've reached the next route
+ if(next_route)
+ {
+ const set<const Track *> &rtracks = next_route->get_tracks();
+ for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
+ if(rtracks.count(j->block->get_endpoints()[j->entry].track))
+ {
+ route = next_route;
+ next_route = 0;
+ // XXX Exceptions?
+ signal_route_changed.emit(route);
+ break;
+ }
+ }
+
// Move blocks up to the next sensor to our current blocks
cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
// Try to get more blocks if we're moving
- if(target_speed && reserve_more()<2)
- update_speed();
+ if(target_speed)
+ {
+ unsigned nsens = reserve_more();
+ if(!nsens && end_of_route)
+ {
+ set_speed(0);
+ set_route(0);
+ }
+ else if(nsens<2)
+ update_speed();
+ }
}
}
else
for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
if(i->block->get_sensor_id())
{
- if(trfc_mgr.get_control().get_sensor(i->block->get_sensor_id()).get_state())
+ if(layout.get_driver().get_sensor(i->block->get_sensor_id()))
break;
else
end = i;
}
}
-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)
{
- if(i->block->get_turnout_id()==tid)
- {
- if(nsens<1)
- throw TurnoutBusy(this);
- break;
- }
- else if(i->block->get_sensor_id())
- ++nsens;
- }
-}
-
-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_turnout_id()==tid)
- {
- release_blocks(rsv_blocks, i, rsv_blocks.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();
- return;
- }
-
- if(pending_block && tid==pending_block->get_turnout_id())
- reserve_more();
+ }
}
void Train::block_reserved(const Block &block, const Train *train)
pending_block = 0;
- // See how many blocks we already have
+ // See how many sensor blocks we already have
unsigned nsens = 0;
for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_sensor_id())
++nsens;
+
+ const Route *cur_route = 0;
+ if(route)
+ {
+ unsigned exit = last->block->traverse(last->entry);
+ Track *track = last->block->get_endpoints()[exit].track;
+ if(route->get_tracks().count(track))
+ cur_route = route;
+ else if(next_route && next_route->get_tracks().count(track))
+ cur_route = next_route;
+ }
bool got_more = false;
BlockRef *good = last;
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)
+ {
+ if(cur_route!=next_route && next_route && next_route->get_tracks().count(entry_ep.track))
+ cur_route = next_route;
+ else if(!cur_route->get_tracks().count(entry_ep.track))
+ {
+ // Keep the blocks if we arrived at the end of the route
+ good = last;
+ good_sens = nsens;
+ end_of_route = true;
+ break;
+ }
+ }
+ else if(route && route->get_tracks().count(entry_ep.track))
+ cur_route = route;
+
if(!link->reserve(this))
{
// If we found another train and it's not headed straight for us, we can keep the blocks we got
if(link->get_turnout_id())
{
- const Block::Endpoint &ep = link->get_endpoints()[entry];
- const Endpoint &track_ep = ep.track->get_type().get_endpoints()[ep.track_ep];
+ const Endpoint &track_ep = entry_ep.track->get_type().get_endpoints()[entry_ep.track_ep];
// Keep the blocks reserved so far, as either us or the other train can diverge
good = last;
good_sens = nsens;
- Turnout &turnout = trfc_mgr.get_control().get_turnout(link->get_turnout_id());
-
// Figure out what path we'd like to take on the turnout
int path = -1;
- if(route)
- path = route->get_turnout(link->get_turnout_id());
+ if(cur_route)
+ path = cur_route->get_turnout(link->get_turnout_id());
if(path<0)
- path = turnout.get_path();
+ path = entry_ep.track->get_active_path();
if(!((track_ep.paths>>path)&1))
{
for(unsigned i=0; track_ep.paths>>i; ++i)
path = i;
}
- if(path!=turnout.get_path())
+ 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;
- turnout.set_path(path);
+ entry_ep.track->set_active_path(path);
break;
}
}
if(got_more)
update_speed();
- return nsens;
+ return good_sens;
}
void Train::update_speed()
{
+ Driver &driver = layout.get_driver();
+
+ unsigned speed;
if(!target_speed)
{
- loco.set_speed(0);
+ speed = 0;
set_status("Stopped");
}
else
unsigned slow_speed = find_speed(0.1); // 31.3 km/h
if(nsens==0)
{
- loco.set_speed(0);
+ speed = 0;
pure_speed = false;
set_status("Blocked");
}
else if(nsens==1 && target_speed>slow_speed)
{
- loco.set_speed(slow_speed);
+ speed = slow_speed;
pure_speed = false;
set_status("Slow");
}
else
{
- loco.set_speed(target_speed);
+ speed = target_speed;
set_status(format("Traveling %d kmh", travel_speed));
}
}
+
+ driver.set_loco_speed(address, speed);
}
float Train::get_real_speed(unsigned i) const
void Train::set_position(const Block::Endpoint &bep)
{
- cur_track = bep.track;
- cur_track_ep = bep.track_ep;
- offset = 0;
- pos = cur_track->get_endpoint_position(cur_track_ep);
+ vehicles[0]->place(bep.track, bep.track_ep, 0, Vehicle::FRONT_AXLE);
}
void Train::release_blocks(list<BlockRef> &blocks)
}
+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::RealSpeed::RealSpeed():
speed(0),
weight(0)
{
add("block", &Loader::block);
add("block_hint", &Loader::block_hint);
- add("name", &Train::name);
+ add("name", &Loader::name);
add("real_speed", &Loader::real_speed);
add("route", &Loader::route);
}
void Train::Loader::block(unsigned id)
{
- Block &blk = obj.trfc_mgr.get_block(id);
+ Block &blk = obj.layout.get_block(id);
int entry = -1;
if(prev_block)
entry = blk.get_endpoint_by_link(*prev_block);
blk.reserve(&obj);
obj.cur_blocks.push_back(BlockRef(&blk, entry));
- obj.status = "Stopped";
+ obj.set_status("Stopped");
obj.set_position(blk.get_endpoints()[entry]);
prev_block = &blk;
void Train::Loader::block_hint(unsigned id)
{
- prev_block = &obj.trfc_mgr.get_block(id);
+ prev_block = &obj.layout.get_block(id);
+}
+
+void Train::Loader::name(const string &n)
+{
+ obj.set_name(n);
}
void Train::Loader::real_speed(unsigned i, float speed, float weight)
void Train::Loader::route(const string &n)
{
- obj.route = &obj.trfc_mgr.get_layout().get_route(n);
+ obj.set_route(&obj.layout.get_route(n));
}
} // namespace Marklin