X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=8b469b52fd848feb52f09c07346a521780c1d8ca;hb=baa096deb2108fe7f692172602ec2d047b68c068;hp=bc8ebe6c43012d628b695ff1ba036f5022489c7f;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp index bc8ebe6..8b469b5 100644 --- a/source/libr2c2/timetable.cpp +++ b/source/libr2c2/timetable.cpp @@ -25,7 +25,8 @@ Timetable::Timetable(Train &t): current_row(0), executing(true), pending_block(0), - pending_train(0) + pending_train(0), + arrived(false) { 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)); @@ -89,12 +90,18 @@ void Timetable::tick(const Time::TimeStamp &t) Row &row = rows[current_row]; switch(row.type) { - case GOTO: - if(!train.go_to(**parse_location(row.get_param(0)).get_tracks().begin())) + case GOTO_SENSOR: + arrived = false; + if(!train.go_to(get_sensor(row.get_param(0)))) + set_enabled(false); + break; + case GOTO_ZONE: + arrived = false; + if(!train.go_to(get_zone(row.get_param(0)))) set_enabled(false); break; case TRAVEL: - pending_block = &parse_location(row.get_param(0)); + pending_block = &get_sensor(row.get_param(0)).get_block(); pending_train = &train; executing = false; break; @@ -102,16 +109,28 @@ void Timetable::tick(const Time::TimeStamp &t) wait_timeout = t+row.get_param(0)*Time::sec; executing = false; break; + case WAIT_UNTIL: + { + unsigned unixtime = t.to_unixtime(); + unsigned mod = row.get_param(1); + unsigned secs = ((mod+row.get_param(0))-(unixtime%mod))%mod; + wait_timeout = t+secs*Time::sec; + executing = false; + } + break; case WAIT_TRAIN: pending_train = &train.get_layout().get_train(row.get_param(0)); - pending_block = &parse_location(row.get_param(1)); + pending_block = &get_sensor(row.get_param(1)).get_block(); executing = false; break; case ARRIVE: - executing = false; + if(!arrived) + executing = false; + arrived = false; break; case SPEED: - train.set_control("speed", row.get_param(0)/3.6*train.get_layout().get_catalogue().get_scale()); + if(!arrived) + train.set_control("speed", row.get_param(0)/3.6*train.get_layout().get_catalogue().get_scale()); break; case REVERSE: train.set_control("reverse", !train.get_control("reverse")); @@ -133,11 +152,19 @@ void Timetable::save(list &st) const st.push_back(i->save()); } -Block &Timetable::parse_location(const string &loc) +Track &Timetable::get_sensor(unsigned id) +{ + Block &block = train.get_layout().get_block(id|0x1000); + return **block.get_tracks().begin(); +} + +Zone &Timetable::get_zone(const string &name) { - if(!loc.compare(0, 7, "sensor ")) - return train.get_layout().get_block(lexical_cast(loc.substr(7))|0x1000); - throw Exception("Named blocks are not supported yet"); + string::size_type space = name.rfind(' '); + if(space==string::npos || space==0) + throw InvalidParameterValue("Invalid zone name"); + unsigned number = lexical_cast(name.substr(space+1)); + return train.get_layout().get_zone(name.substr(0, space), number); } void Timetable::sensor_event(unsigned addr, bool state) @@ -158,6 +185,8 @@ void Timetable::train_arrived() current_row = (current_row+1)%rows.size(); executing = true; } + else + arrived = true; } @@ -184,12 +213,16 @@ string Timetable::Row::str() const { switch(type) { - case GOTO: + case GOTO_SENSOR: + return "set route to sensor "+get_param(0); + case GOTO_ZONE: return "set route to "+get_param(0); case TRAVEL: - return "travel to "+get_param(0); + return format("travel to sensor %d", get_param(0)); case WAIT_TIME: return format("wait for %d seconds", get_param(0)); + case WAIT_UNTIL: + return format("wait until %d mod %d seconds", get_param(0), get_param(1)); case WAIT_TRAIN: return format("wait for train %d at %s", get_param(0), get_param(1)); case ARRIVE: @@ -209,14 +242,18 @@ DataFile::Statement Timetable::Row::save() const { switch(type) { - case GOTO: - return DataFile::Statement("goto"), get_param(0); + case GOTO_SENSOR: + return DataFile::Statement("goto_sensor"), get_param(0); + case GOTO_ZONE: + return DataFile::Statement("goto_zone"), get_param(0); case TRAVEL: - return DataFile::Statement("travel"), get_param(0); + return DataFile::Statement("travel"), get_param(0); case WAIT_TIME: return DataFile::Statement("wait"), get_param(0); + case WAIT_UNTIL: + return DataFile::Statement("wait_until"), get_param(0), get_param(1); case WAIT_TRAIN: - return DataFile::Statement("wait_train"), get_param(0), get_param(1); + return DataFile::Statement("wait_train"), get_param(0), get_param(1); case ARRIVE: return DataFile::Statement("arrive"); case SPEED: @@ -234,8 +271,8 @@ Timetable::Row Timetable::Row::parse(const string &s) { if(!s.compare(0, 7, "travel ")) { - if(!s.compare(7, 3, "to ")) - return Row(TRAVEL, s.substr(10)); + if(!s.compare(7, 10, "to sensor ")) + return Row(TRAVEL, lexical_cast(s.substr(17))); else if(!s.compare(7, string::npos, "until arrival")) return Row(ARRIVE); } @@ -250,15 +287,36 @@ Timetable::Row Timetable::Row::parse(const string &s) } else if(!s.compare(9, 6, "train ")) { - string::size_type at = s.find(" at ", 15); + string::size_type at = s.find(" at sensor ", 15); if(at!=string::npos) { Row row(WAIT_TRAIN, lexical_cast(s.substr(15, at-15))); - row.params.push_back(s.substr(at+4)); + row.params.push_back(lexical_cast(s.substr(at+11))); return row; } } } + else if(!s.compare(0, 11, "wait until ")) + { + string::size_type mod = s.find(" mod ", 11); + unsigned nondigit = (mod!=string::npos ? mod+5 : 11); + while(nondigit(s.substr(11, mod-11)); + Row row(WAIT_UNTIL, time); + row.params.push_back(lexical_cast(s.substr(mod+5, nondigit-mod-5))); + return row; + } + else + { + unsigned time = lexical_cast(s.substr(11, nondigit-11)); + Row row(WAIT_UNTIL, time); + row.params.push_back(3600); + return row; + } + } else if(!s.compare(0, 10, "set speed ")) { unsigned nondigit = 11; @@ -271,7 +329,12 @@ Timetable::Row Timetable::Row::parse(const string &s) else if(!s.compare(0, 10, "set route ")) { if(!s.compare(10, 3, "to ")) - return Row(GOTO, s.substr(13)); + { + if(!s.compare(13, 7, "sensor ")) + return Row(GOTO_SENSOR, lexical_cast(s.substr(20))); + else + return Row(GOTO_ZONE, s.substr(13)); + } return Row(ROUTE, s.substr(10)); } @@ -282,14 +345,19 @@ Timetable::Row Timetable::Row::parse(const string &s) Timetable::Loader::Loader(Timetable &tt): DataFile::ObjectLoader(tt) { - add("arrive", &Loader::arrive); - add("goto", &Loader::go_to); - add("route", &Loader::route); - add("speed", &Loader::speed); - add("reverse", &Loader::reverse); - add("travel", &Loader::travel); - add("wait", &Loader::wait); - add("wait_train", &Loader::wait_train); + add("arrive", &Loader::arrive); + add("goto_sensor", static_cast(&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("wait", &Loader::wait); + add("wait_train", &Loader::wait_train); + add("wait_until", &Loader::wait_until); + + // Deprecated alias + add("goto", static_cast(&Loader::goto_sensor)); } void Timetable::Loader::arrive() @@ -297,9 +365,20 @@ void Timetable::Loader::arrive() obj.rows.push_back(Row(ARRIVE)); } -void Timetable::Loader::go_to(const string &t) +void Timetable::Loader::goto_sensor(unsigned s) +{ + obj.rows.push_back(Row(GOTO_SENSOR, s)); +} + +void Timetable::Loader::goto_sensor(const string &s) { - obj.rows.push_back(Row(GOTO, t)); + if(!s.compare(0, 7, "sensor ")) + obj.rows.push_back(Row(GOTO_SENSOR, lexical_cast(s.substr(7)))); +} + +void Timetable::Loader::goto_zone(const string &z) +{ + obj.rows.push_back(Row(GOTO_ZONE, z)); } void Timetable::Loader::route(const string &r) @@ -317,9 +396,9 @@ void Timetable::Loader::speed(unsigned s) obj.rows.push_back(Row(SPEED, s)); } -void Timetable::Loader::travel(const string &t) +void Timetable::Loader::travel(unsigned s) { - obj.rows.push_back(Row(TRAVEL, t)); + obj.rows.push_back(Row(TRAVEL, s)); } void Timetable::Loader::wait(unsigned t) @@ -327,10 +406,17 @@ void Timetable::Loader::wait(unsigned t) obj.rows.push_back(Row(WAIT_TIME, t)); } -void Timetable::Loader::wait_train(unsigned t, const string &b) +void Timetable::Loader::wait_train(unsigned t, unsigned s) { Row row(WAIT_TRAIN, t); - row.params.push_back(b); + row.params.push_back(s); + obj.rows.push_back(row); +} + +void Timetable::Loader::wait_until(unsigned t, unsigned m) +{ + Row row(WAIT_UNTIL, t); + row.params.push_back(m); obj.rows.push_back(row); }