X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=9fd44df6d80a480b6d9eb95e9a3cec1cc82e6550;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=670114cdd4454fab36d1be60355a8b22bab2631e;hpb=598631d530a20ba8f4710f45747a9742e149f604;p=r2c2.git diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp index 670114c..9fd44df 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,7 +13,7 @@ using namespace Msp; namespace R2C2 { Timetable::Timetable(Train &t): - train(t), + TrainAI(t), enabled(false), current_row(0), executing(true), @@ -31,7 +24,7 @@ Timetable::Timetable(Train &t): train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced)); train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived)); Layout &layout = train.get_layout(); - layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event)); + 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)); } @@ -62,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) @@ -72,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; @@ -104,9 +97,15 @@ void Timetable::tick(const Time::TimeStamp &t) set_enabled(false); break; case TRAVEL_TO: - pending_block = &get_sensor(row.get_param(0)).get_block(); - pending_train = &train; - executing = false; + { + Block *block = &get_sensor(row.get_param(0)).get_block(); + if(block->get_train()!=&train || block->get_state()(0)).get_block(); @@ -127,9 +126,16 @@ 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)).get_block(); + if(block->get_train()!=other_train || block->get_state()(0)/3.6*train.get_layout().get_catalogue().get_scale()); + { + 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)))) @@ -156,6 +165,8 @@ void Timetable::tick(const Time::TimeStamp &t) void Timetable::save(list &st) const { + if(!tag.empty()) + st.push_back((DataFile::Statement("tag"), tag)); for(vector::const_iterator i=rows.begin(); i!=rows.end(); ++i) st.push_back(i->save()); } @@ -176,14 +187,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(); @@ -193,6 +207,9 @@ void Timetable::sensor_event(unsigned addr, bool state) 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]; @@ -207,6 +224,9 @@ void Timetable::block_reserved(Block &block, Train *trn) void Timetable::train_advanced(Block &block) { + if(rows.empty() || !enabled) + return; + Row &row = rows[current_row]; if(row.type==TRAVEL_PAST && &block==pending_block && pending_train) pending_train = 0; @@ -214,6 +234,9 @@ void Timetable::train_advanced(Block &block) void Timetable::train_arrived() { + if(rows.empty() || !enabled) + return; + Row &row = rows[current_row]; if(row.type==ARRIVE) { @@ -240,7 +263,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(); } @@ -249,7 +272,7 @@ 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_TO: @@ -261,7 +284,7 @@ string Timetable::Row::str() const 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: @@ -379,7 +402,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"); } @@ -392,6 +415,7 @@ Timetable::Loader::Loader(Timetable &tt): add("route", &Loader::route); add("speed", &Loader::speed); add("reverse", &Loader::reverse); + add("tag", &Loader::tag); add("travel_to", &Loader::travel_to); add("travel_past", &Loader::travel_past); add("wait", &Loader::wait); @@ -439,6 +463,11 @@ void Timetable::Loader::speed(unsigned s) obj.rows.push_back(Row(SPEED, s)); } +void Timetable::Loader::tag(const string &t) +{ + obj.tag = t; +} + void Timetable::Loader::travel_to(unsigned s) { obj.rows.push_back(Row(TRAVEL_TO, s));