enabled = e;
}
+void Timetable::reset()
+{
+ current_row = 0;
+ wait_timeout = Time::TimeStamp();
+ pending_block = 0;
+ executing = true;
+}
+
void Timetable::clear()
{
rows.clear();
- current_row = 0;
+ reset();
}
void Timetable::append(const Row &row)
{
case GOTO:
train.go_to(**parse_location(row.strparam).get_tracks().begin());
- executing = false;
break;
case TRAVEL:
pending_block = &parse_location(row.strparam);
wait_timeout = t+row.intparam*Time::sec;
executing = false;
break;
+ case ARRIVE:
+ executing = false;
+ break;
case SPEED:
train.set_control("speed", row.intparam/3.6*train.get_layout().get_catalogue().get_scale());
break;
case WAIT:
st.push_back((DataFile::Statement("wait"), i->intparam));
break;
+ case ARRIVE:
+ st.push_back(DataFile::Statement("arrive"));
+ break;
case SPEED:
st.push_back((DataFile::Statement("speed"), i->intparam));
break;
void Timetable::train_arrived()
{
Row &row = rows[current_row];
- if(row.type==GOTO)
+ if(row.type==ARRIVE)
{
current_row = (current_row+1)%rows.size();
executing = true;
return "travel to "+strparam;
case WAIT:
return format("wait for %d seconds", intparam);
+ case ARRIVE:
+ return "wait for arrival";
case SPEED:
return format("set speed %d km/h", intparam);
case ROUTE:
++nondigit;
return Row(WAIT, lexical_cast<unsigned>(s.substr(9, nondigit-9)));
}
+ else if(s=="wait for arrival")
+ return Row(ARRIVE, 0);
else if(!s.compare(0, 10, "set speed "))
{
unsigned nondigit = 11;
- while(nondigit<s.size() && isdigit(s[nondigit]))
+ while(nondigit<s.size() && (isdigit(s[nondigit]) || s[nondigit]=='-'))
++nondigit;
- return Row(SPEED, lexical_cast<unsigned>(s.substr(10, nondigit-10)));
+ return Row(SPEED, lexical_cast<int>(s.substr(10, nondigit-10)));
}
else if(!s.compare(0, 10, "set route "))
return Row(ROUTE, s.substr(10));
Timetable::Loader::Loader(Timetable &tt):
DataFile::ObjectLoader<Timetable>(tt)
{
+ add("arrive", &Loader::arrive);
add("goto", &Loader::go_to);
add("route", &Loader::route);
add("speed", &Loader::speed);
add("wait", &Loader::wait);
}
+void Timetable::Loader::arrive()
+{
+ obj.rows.push_back(Row(ARRIVE, 0));
+}
+
void Timetable::Loader::go_to(const string &t)
{
obj.rows.push_back(Row(GOTO, t));