X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=4a78bcafadab289f5e2f88a4004d449b4e32fe06;hb=2c0a478641a10a739557d055f80354a28936ced1;hp=dd91d219ab21f22be20b156348c2c17bb6643875;hpb=7e27b311e33beda1746eb63e0945633f262427f6;p=r2c2.git diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp index dd91d21..4a78bca 100644 --- a/source/libr2c2/timetable.cpp +++ b/source/libr2c2/timetable.cpp @@ -1,7 +1,7 @@ /* $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 */ @@ -25,10 +25,14 @@ Timetable::Timetable(Train &t): 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.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event)); + layout.signal_block_reserved.connect(sigc::mem_fun(this, &Timetable::block_reserved)); } void Timetable::set_enabled(bool e) @@ -90,32 +94,51 @@ void Timetable::tick(const Time::TimeStamp &t) switch(row.type) { 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: + case TRAVEL_TO: pending_block = &get_sensor(row.get_param(0)).get_block(); pending_train = &train; executing = false; break; + case TRAVEL_PAST: + pending_block = &get_turnout(row.get_param(0)).get_block(); + pending_train = (pending_block->get_train()==&train ? 0 : &train); + executing = false; + break; case WAIT_TIME: 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 = &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")); @@ -143,6 +166,12 @@ Track &Timetable::get_sensor(unsigned id) 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(' '); @@ -162,6 +191,27 @@ void Timetable::sensor_event(unsigned addr, bool state) } } +void Timetable::block_reserved(Block &block, Train *trn) +{ + 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) +{ + Row &row = rows[current_row]; + if(row.type==TRAVEL_PAST && &block==pending_block && pending_train) + pending_train = 0; +} + void Timetable::train_arrived() { Row &row = rows[current_row]; @@ -170,6 +220,8 @@ void Timetable::train_arrived() current_row = (current_row+1)%rows.size(); executing = true; } + else + arrived = true; } @@ -197,13 +249,17 @@ string Timetable::Row::str() const switch(type) { case GOTO_SENSOR: - return "set route to sensor "+get_param(0); + return format("set route to sensor %d", get_param(0)); case GOTO_ZONE: return "set route to "+get_param(0); - case TRAVEL: - return "travel to "+get_param(0); + case TRAVEL_TO: + return format("travel to sensor %d", get_param(0)); + case TRAVEL_PAST: + return format("travel past turnout %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: @@ -227,10 +283,14 @@ DataFile::Statement Timetable::Row::save() const 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); + case TRAVEL_TO: + return DataFile::Statement("travel_to"), get_param(0); + case TRAVEL_PAST: + return DataFile::Statement("travel_past"), 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); case ARRIVE: @@ -251,7 +311,9 @@ Timetable::Row Timetable::Row::parse(const string &s) if(!s.compare(0, 7, "travel ")) { if(!s.compare(7, 10, "to sensor ")) - return Row(TRAVEL, lexical_cast(s.substr(17))); + return Row(TRAVEL_TO, lexical_cast(s.substr(17))); + else if(!s.compare(7, 13, "past turnout ")) + return Row(TRAVEL_PAST, lexical_cast(s.substr(20))); else if(!s.compare(7, string::npos, "until arrival")) return Row(ARRIVE); } @@ -275,6 +337,27 @@ Timetable::Row Timetable::Row::parse(const string &s) } } } + 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; @@ -304,17 +387,20 @@ Timetable::Loader::Loader(Timetable &tt): DataFile::ObjectLoader(tt) { add("arrive", &Loader::arrive); - add("goto_sensor", static_cast(&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("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(&Loader::goto_sensor)); + add("goto", &Loader::goto_sensor_str); + add("travel", &Loader::travel_to); } void Timetable::Loader::arrive() @@ -327,7 +413,7 @@ void Timetable::Loader::goto_sensor(unsigned s) 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(s.substr(7)))); @@ -353,9 +439,14 @@ void Timetable::Loader::speed(unsigned s) obj.rows.push_back(Row(SPEED, s)); } -void Timetable::Loader::travel(const string &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) @@ -370,4 +461,11 @@ void Timetable::Loader::wait_train(unsigned t, unsigned 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); +} + } // namespace R2C2