-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
#include <msp/time/units.h>
#include "block.h"
#include "catalogue.h"
namespace R2C2 {
Timetable::Timetable(Train &t):
- train(t),
+ TrainAI(t),
enabled(false),
current_row(0),
executing(true),
train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced));
train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived));
Layout &layout = train.get_layout();
- layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event));
+ layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Timetable::block_state_changed));
layout.signal_block_reserved.connect(sigc::mem_fun(this, &Timetable::block_reserved));
}
void Timetable::insert(unsigned i, const Row &row)
{
if(i>rows.size())
- throw InvalidParameterValue("Insert position out of range");
+ throw out_of_range("Timetable::insert");
rows.insert(rows.begin()+i, row);
if(i<=current_row)
const Timetable::Row &Timetable::get_row(unsigned i) const
{
if(i>=rows.size())
- throw InvalidParameterValue("Row index out of range");
+ throw out_of_range("Timetable::get_row");
return rows[i];
}
-void Timetable::tick(const Time::TimeStamp &t)
+void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
{
if(rows.empty() || !enabled)
return;
set_enabled(false);
break;
case TRAVEL_TO:
- pending_block = &get_sensor(row.get_param<unsigned>(0)).get_block();
- pending_train = &train;
- executing = false;
+ {
+ Block *block = &get_sensor(row.get_param<unsigned>(0)).get_block();
+ if(block->get_train()!=&train || block->get_state()<Block::MAYBE_ACTIVE)
+ {
+ pending_block = block;
+ pending_train = &train;
+ executing = false;
+ }
+ }
break;
case TRAVEL_PAST:
pending_block = &get_turnout(row.get_param<unsigned>(0)).get_block();
}
break;
case WAIT_TRAIN:
- pending_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
- pending_block = &get_sensor(row.get_param<unsigned>(1)).get_block();
- executing = false;
+ {
+ Train *other_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
+ Block *block = &get_sensor(row.get_param<unsigned>(1)).get_block();
+ if(block->get_train()!=other_train || block->get_state()<Block::MAYBE_ACTIVE)
+ {
+ pending_train = other_train;
+ pending_block = block;
+ executing = false;
+ }
+ }
break;
case ARRIVE:
if(!arrived)
break;
case SPEED:
if(!arrived)
- train.set_control("speed", row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale());
+ {
+ float speed = row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale();
+ train.ai_message(Message("set-target-speed", speed));
+ }
break;
case REVERSE:
- train.set_control("reverse", !train.get_control("reverse"));
+ train.ai_message(Message("toggle-reverse"));
break;
case ROUTE:
if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
void Timetable::save(list<DataFile::Statement> &st) const
{
+ if(!tag.empty())
+ st.push_back((DataFile::Statement("tag"), tag));
for(vector<Row>::const_iterator i=rows.begin(); i!=rows.end(); ++i)
st.push_back(i->save());
}
{
string::size_type space = name.rfind(' ');
if(space==string::npos || space==0)
- throw InvalidParameterValue("Invalid zone name");
+ throw invalid_argument("Timetable::get_zone");
unsigned number = lexical_cast<unsigned>(name.substr(space+1));
return train.get_layout().get_zone(name.substr(0, space), number);
}
-void Timetable::sensor_event(unsigned addr, bool state)
+void Timetable::block_state_changed(Block &block, Block::State state)
{
- if(pending_block && pending_block->get_train()==pending_train && addr==pending_block->get_sensor_id() && state)
+ if(rows.empty() || !enabled)
+ return;
+
+ if(&block==pending_block && block.get_train()==pending_train && state>=Block::MAYBE_ACTIVE)
{
pending_block = 0;
current_row = (current_row+1)%rows.size();
void Timetable::block_reserved(Block &block, Train *trn)
{
+ if(rows.empty() || !enabled)
+ return;
+
if(&block==pending_block && trn==pending_train)
{
Row &row = rows[current_row];
void Timetable::train_advanced(Block &block)
{
+ if(rows.empty() || !enabled)
+ return;
+
Row &row = rows[current_row];
if(row.type==TRAVEL_PAST && &block==pending_block && pending_train)
pending_train = 0;
void Timetable::train_arrived()
{
+ if(rows.empty() || !enabled)
+ return;
+
Row &row = rows[current_row];
if(row.type==ARRIVE)
{
const T &Timetable::Row::get_param(unsigned i) const
{
if(i>=params.size())
- throw InvalidParameterValue("Parameter index out of range");
+ throw out_of_range("Timetable::Row::get_param");
return params[i].value<T>();
}
switch(type)
{
case GOTO_SENSOR:
- return "set route to sensor "+get_param<unsigned>(0);
+ return format("set route to sensor %d", get_param<unsigned>(0));
case GOTO_ZONE:
return "set route to "+get_param<string>(0);
case TRAVEL_TO:
case WAIT_UNTIL:
return format("wait until %d mod %d seconds", get_param<unsigned>(0), get_param<unsigned>(1));
case WAIT_TRAIN:
- return format("wait for train %d at %s", get_param<unsigned>(0), get_param<string>(1));
+ return format("wait for train %d at sensor %d", get_param<unsigned>(0), get_param<unsigned>(1));
case ARRIVE:
return "travel until arrival";
case SPEED:
return Row(ROUTE, s.substr(10));
}
- throw InvalidParameterValue("Invalid row");
+ throw invalid_argument("Timetable::Row::parse");
}
add("route", &Loader::route);
add("speed", &Loader::speed);
add("reverse", &Loader::reverse);
+ add("tag", &Loader::tag);
add("travel_to", &Loader::travel_to);
add("travel_past", &Loader::travel_past);
add("wait", &Loader::wait);
obj.rows.push_back(Row(SPEED, s));
}
+void Timetable::Loader::tag(const string &t)
+{
+ obj.tag = t;
+}
+
void Timetable::Loader::travel_to(unsigned s)
{
obj.rows.push_back(Row(TRAVEL_TO, s));
projects / r2c2.git / blobdiff