/* $Id$
This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
namespace R2C2 {
Timetable::Timetable(Train &t):
- train(t),
+ TrainAI(t),
enabled(false),
current_row(0),
executing(true),
pending_block(0),
- pending_train(0)
+ pending_train(0),
+ arrived(false)
{
+ train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced));
train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived));
- train.get_layout().get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event));
+ Layout &layout = train.get_layout();
+ 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::set_enabled(bool e)
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;
switch(row.type)
{
case GOTO_SENSOR:
+ arrived = false;
if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
set_enabled(false);
break;
case GOTO_ZONE:
+ arrived = false;
if(!train.go_to(get_zone(row.get_param<string>(0))))
set_enabled(false);
break;
- case TRAVEL:
- pending_block = &get_sensor(row.get_param<unsigned>(0)).get_block();
- pending_train = &train;
+ case TRAVEL_TO:
+ {
+ 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();
+ pending_train = (pending_block->get_train()==&train ? 0 : &train);
executing = false;
break;
case WAIT_TIME:
}
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:
- executing = false;
+ if(!arrived)
+ executing = false;
+ arrived = false;
break;
case SPEED:
- train.set_control("speed", row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale());
+ if(!arrived)
+ {
+ 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());
}
return **block.get_tracks().begin();
}
+Track &Timetable::get_turnout(unsigned id)
+{
+ Block &block = train.get_layout().get_block(id|0x2000);
+ return **block.get_tracks().begin();
+}
+
Zone &Timetable::get_zone(const string &name)
{
string::size_type space = name.rfind(' ');
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];
+ if(row.type==TRAVEL_PAST && !pending_train)
+ {
+ pending_block = 0;
+ current_row = (current_row+1)%rows.size();
+ executing = true;
+ }
+ }
+}
+
+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)
{
current_row = (current_row+1)%rows.size();
executing = true;
}
+ else
+ arrived = true;
}
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:
- return "travel to "+get_param<string>(0);
+ case TRAVEL_TO:
+ return format("travel to sensor %d", get_param<unsigned>(0));
+ case TRAVEL_PAST:
+ return format("travel past turnout %d", get_param<unsigned>(0));
case WAIT_TIME:
return format("wait for %d seconds", get_param<unsigned>(0));
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 DataFile::Statement("goto_sensor"), get_param<unsigned>(0);
case GOTO_ZONE:
return DataFile::Statement("goto_zone"), get_param<string>(0);
- case TRAVEL:
- return DataFile::Statement("travel"), get_param<string>(0);
+ case TRAVEL_TO:
+ return DataFile::Statement("travel_to"), get_param<unsigned>(0);
+ case TRAVEL_PAST:
+ return DataFile::Statement("travel_past"), get_param<unsigned>(0);
case WAIT_TIME:
return DataFile::Statement("wait"), get_param<unsigned>(0);
case WAIT_UNTIL:
if(!s.compare(0, 7, "travel "))
{
if(!s.compare(7, 10, "to sensor "))
- return Row(TRAVEL, lexical_cast<unsigned>(s.substr(17)));
+ return Row(TRAVEL_TO, lexical_cast<unsigned>(s.substr(17)));
+ else if(!s.compare(7, 13, "past turnout "))
+ return Row(TRAVEL_PAST, lexical_cast<unsigned>(s.substr(20)));
else if(!s.compare(7, string::npos, "until arrival"))
return Row(ARRIVE);
}
DataFile::ObjectLoader<Timetable>(tt)
{
add("arrive", &Loader::arrive);
- add("goto_sensor", static_cast<void (Loader::*)(unsigned)>(&Loader::goto_sensor));
+ add("goto_sensor", &Loader::goto_sensor);
add("goto_zone", &Loader::goto_zone);
add("route", &Loader::route);
add("speed", &Loader::speed);
add("reverse", &Loader::reverse);
- add("travel", &Loader::travel);
+ add("tag", &Loader::tag);
+ add("travel_to", &Loader::travel_to);
+ add("travel_past", &Loader::travel_past);
add("wait", &Loader::wait);
add("wait_train", &Loader::wait_train);
add("wait_until", &Loader::wait_until);
// Deprecated alias
- add("goto", static_cast<void (Loader::*)(const string &)>(&Loader::goto_sensor));
+ add("goto", &Loader::goto_sensor_str);
+ add("travel", &Loader::travel_to);
}
void Timetable::Loader::arrive()
obj.rows.push_back(Row(GOTO_SENSOR, s));
}
-void Timetable::Loader::goto_sensor(const string &s)
+void Timetable::Loader::goto_sensor_str(const string &s)
{
if(!s.compare(0, 7, "sensor "))
obj.rows.push_back(Row(GOTO_SENSOR, lexical_cast<unsigned>(s.substr(7))));
obj.rows.push_back(Row(SPEED, s));
}
-void Timetable::Loader::travel(const string &t)
+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));
+}
+
+void Timetable::Loader::travel_past(unsigned s)
{
- obj.rows.push_back(Row(TRAVEL, t));
+ obj.rows.push_back(Row(TRAVEL_PAST, s));
}
void Timetable::Loader::wait(unsigned t)
projects / r2c2.git / blobdiff