X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=44e859e9a5b9becbb3d943adc8bb198287428f1a;hb=54392d65e2053d1eacb4cfcc435f1013993f2973;hp=c28cbccae245a6dcb7650eb4e0237feb85056ccf;hpb=9a4aeac8f8278eea6cbd67addfb76ace8c937e3c;p=r2c2.git diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp index c28cbcc..44e859e 100644 --- a/source/libr2c2/timetable.cpp +++ b/source/libr2c2/timetable.cpp @@ -1,11 +1,4 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - -#include +#include #include #include "block.h" #include "catalogue.h" @@ -20,15 +13,19 @@ using namespace Msp; 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_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived)); - train.get_layout().get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event)); + train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced)); + 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::set_enabled(bool e) @@ -58,7 +55,7 @@ void Timetable::append(const Row &row) 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) @@ -68,11 +65,11 @@ void Timetable::insert(unsigned i, const Row &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]; } -void Timetable::tick(const Time::TimeStamp &t) +void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &) { if(rows.empty() || !enabled) return; @@ -90,16 +87,27 @@ void Timetable::tick(const Time::TimeStamp &t) switch(row.type) { case GOTO_SENSOR: - if(!train.go_to(get_sensor(row.get_param(0)))) - set_enabled(false); + arrived = false; + train.ai_message(Message("set-destination-block", &get_sensor(row.get_param(0)))); break; case GOTO_ZONE: - if(!train.go_to(get_zone(row.get_param(0)))) - set_enabled(false); + arrived = false; + train.ai_message(Message("set-destination-zone", &get_zone(row.get_param(0)))); + break; + case TRAVEL_TO: + { + Block *block = &get_sensor(row.get_param(0)); + if(block->get_train()!=&train || block->get_state()(0)).get_block(); - pending_train = &train; + 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: @@ -116,22 +124,34 @@ void Timetable::tick(const Time::TimeStamp &t) } 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; + { + Train *other_train = &train.get_layout().get_train(row.get_param(0)); + Block *block = &get_sensor(row.get_param(1)); + if(block->get_train()!=other_train || block->get_state()(0)/3.6*train.get_layout().get_catalogue().get_scale()); + if(!arrived) + { + float speed = row.get_param(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(0)))) - set_enabled(false); + train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param(0)))); break; } @@ -146,9 +166,14 @@ void Timetable::save(list &st) const st.push_back(i->save()); } -Track &Timetable::get_sensor(unsigned id) +Block &Timetable::get_sensor(unsigned id) { - Block &block = train.get_layout().get_block(id|0x1000); + return train.get_layout().get_block(id|0x1000); +} + +Track &Timetable::get_turnout(unsigned id) +{ + Block &block = train.get_layout().get_block(id|0x2000); return **block.get_tracks().begin(); } @@ -156,14 +181,17 @@ Zone &Timetable::get_zone(const string &name) { 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(name.substr(space+1)); 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(); @@ -171,13 +199,48 @@ void Timetable::sensor_event(unsigned addr, bool state) } } -void Timetable::train_arrived() +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==ARRIVE) + if(row.type==TRAVEL_PAST && &block==pending_block && pending_train) + pending_train = 0; +} + +void Timetable::event(TrainAI &, const Message &ev) +{ + 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; } } @@ -197,7 +260,7 @@ template 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(); } @@ -206,17 +269,19 @@ 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)); + return format("wait for train %d at sensor %d", get_param(0), get_param(1)); case ARRIVE: return "travel until arrival"; case SPEED: @@ -238,8 +303,10 @@ 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: @@ -264,7 +331,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); } @@ -330,7 +399,7 @@ Timetable::Row Timetable::Row::parse(const string &s) return Row(ROUTE, s.substr(10)); } - throw InvalidParameterValue("Invalid row"); + throw invalid_argument("Timetable::Row::parse"); } @@ -338,18 +407,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() @@ -362,7 +433,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)))); @@ -388,9 +459,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)