X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=5be3a03ce07c893df50b05ea4b4985d9e22606b9;hb=59bae8acd679127602cf35d22bcd37e316a5a056;hp=4a78bcafadab289f5e2f88a4004d449b4e32fe06;hpb=2c0a478641a10a739557d055f80354a28936ced1;p=r2c2.git diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp index 4a78bca..5be3a03 100644 --- a/source/libr2c2/timetable.cpp +++ b/source/libr2c2/timetable.cpp @@ -1,17 +1,11 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2010-2011 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - -#include +#include #include #include "block.h" #include "catalogue.h" #include "driver.h" #include "layout.h" #include "timetable.h" +#include "trackcircuit.h" #include "train.h" using namespace std; @@ -20,7 +14,7 @@ using namespace Msp; namespace R2C2 { Timetable::Timetable(Train &t): - train(t), + TrainAI(t), enabled(false), current_row(0), executing(true), @@ -29,9 +23,9 @@ Timetable::Timetable(Train &t): 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.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event)); Layout &layout = train.get_layout(); - layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event)); + layout.signal_sensor_state_changed.connect(sigc::mem_fun(this, &Timetable::sensor_state_changed)); layout.signal_block_reserved.connect(sigc::mem_fun(this, &Timetable::block_reserved)); } @@ -62,7 +56,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 +66,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; @@ -95,18 +89,22 @@ void Timetable::tick(const Time::TimeStamp &t) { case GOTO_SENSOR: arrived = false; - if(!train.go_to(get_sensor(row.get_param(0)))) - set_enabled(false); + train.ai_message(Message("set-destination-block", &get_sensor(row.get_param(0)))); break; case GOTO_ZONE: arrived = false; - if(!train.go_to(get_zone(row.get_param(0)))) - set_enabled(false); + train.ai_message(Message("set-destination-zone", &get_zone(row.get_param(0)))); 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)); + if(block->get_train()!=&train || block->get_sensor().get_state()(0)).get_block(); @@ -127,9 +125,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)); + if(block->get_train()!=other_train || block->get_sensor().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)))) - set_enabled(false); + train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param(0)))); break; } @@ -160,10 +167,9 @@ 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 **block.get_tracks().begin(); + return train.get_layout().get_block(id|0x1000); } Track &Timetable::get_turnout(unsigned id) @@ -176,14 +182,23 @@ 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::sensor_state_changed(Sensor &sensor, Sensor::State state) { - if(pending_block && pending_block->get_train()==pending_train && addr==pending_block->get_sensor_id() && state) + if(rows.empty() || !enabled) + return; + + Block *block = 0; + if(TrackCircuit *tc = dynamic_cast(&sensor)) + block = &tc->get_block(); + else + return; + + if(block==pending_block && block->get_train()==pending_train && state>=Sensor::MAYBE_ACTIVE) { pending_block = 0; current_row = (current_row+1)%rows.size(); @@ -193,6 +208,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,21 +225,30 @@ 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; } -void Timetable::train_arrived() +void Timetable::event(TrainAI &, const Message &ev) { - Row &row = rows[current_row]; - if(row.type==ARRIVE) + 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; } - else - arrived = true; } @@ -240,7 +267,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(); } @@ -261,7 +288,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 +406,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"); }