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.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::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::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];
}
{
case GOTO_SENSOR:
arrived = false;
- if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
- set_enabled(false);
+ train.ai_message(Message("go-to-track", &get_sensor(row.get_param<unsigned>(0))));
break;
case GOTO_ZONE:
arrived = false;
- if(!train.go_to(get_zone(row.get_param<string>(0))))
- set_enabled(false);
+ train.ai_message(Message("go-to-zone", &get_zone(row.get_param<string>(0))));
break;
case TRAVEL_TO:
{
train.ai_message(Message("toggle-reverse"));
break;
case ROUTE:
- if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
- set_enabled(false);
+ train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param<string>(0))));
break;
}
{
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);
}
pending_train = 0;
}
-void Timetable::train_arrived()
+void Timetable::event(TrainAI &, const Message &ev)
{
- if(rows.empty() || !enabled)
- return;
-
- Row &row = rows[current_row];
- if(row.type==ARRIVE)
+ if(ev.type=="arrived")
{
- current_row = (current_row+1)%rows.size();
- executing = true;
+ 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;
}
- else
- arrived = true;
}
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>();
}
return Row(ROUTE, s.substr(10));
}
- throw InvalidParameterValue("Invalid row");
+ throw invalid_argument("Timetable::Row::parse");
}