Simplify some interfaces by using track and block iterators

[r2c2.git] / source / libr2c2 / timetable.cpp

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index c2a86a6e23db26d4da3dda44de08d79e715b7a2c..44e859e9a5b9becbb3d943adc8bb198287428f1a 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -1,11 +1,4 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
 #include "catalogue.h"
@@ -29,9 +22,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_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,7 +65,7 @@ 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];
 }
 
@@ -95,18 +88,22 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
                {
                case GOTO_SENSOR:
                        arrived = false;
-                       if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("set-destination-block", &get_sensor(row.get_param<unsigned>(0))));
                        break;
                case GOTO_ZONE:
                        arrived = false;
-                       if(!train.go_to(get_zone(row.get_param<string>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("set-destination-zone", &get_zone(row.get_param<string>(0))));
                        break;
                case TRAVEL_TO:
-                       pending_block = &get_sensor(row.get_param<unsigned>(0)).get_block();
-                       pending_train = &train;
-                       executing = false;
+                       {
+                               Block *block = &get_sensor(row.get_param<unsigned>(0));
+                               if(block->get_train()!=&train || block->get_state()<Block::MAYBE_ACTIVE)
+                               {
+                                       pending_block = block;
+                                       pending_train = &train;
+                                       executing = false;
+                               }
+                       }
                        break;
                case TRAVEL_PAST:
                        pending_block = &get_turnout(row.get_param<unsigned>(0)).get_block();
@@ -127,9 +124,16 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
                        }
                        break;
                case WAIT_TRAIN:
-                       pending_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
-                       pending_block = &get_sensor(row.get_param<unsigned>(1)).get_block();
-                       executing = false;
+                       {
+                               Train *other_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
+                               Block *block = &get_sensor(row.get_param<unsigned>(1));
+                               if(block->get_train()!=other_train || block->get_state()<Block::MAYBE_ACTIVE)
+                               {
+                                       pending_train = other_train;
+                                       pending_block = block;
+                                       executing = false;
+                               }
+                       }
                        break;
                case ARRIVE:
                        if(!arrived)
@@ -147,8 +151,7 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
                        train.ai_message(Message("toggle-reverse"));
                        break;
                case ROUTE:
-                       if(!train.set_route(&train.get_layout().get_route(row.get_param<string>(0))))
-                               set_enabled(false);
+                       train.ai_message(Message("set-route", &train.get_layout().get_route(row.get_param<string>(0))));
                        break;
                }
 
@@ -159,16 +162,13 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 
 void Timetable::save(list<DataFile::Statement> &st) const
 {
-       if(!tag.empty())
-               st.push_back((DataFile::Statement("tag"), tag));
        for(vector<Row>::const_iterator i=rows.begin(); i!=rows.end(); ++i)
                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)
@@ -181,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<unsigned>(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();
@@ -198,6 +201,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];
@@ -212,21 +218,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;
 }
 
 
@@ -245,7 +260,7 @@ template<typename T>
 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<T>();
 }
 
@@ -266,7 +281,7 @@ string Timetable::Row::str() const
        case WAIT_UNTIL:
                return format("wait until %d mod %d seconds", get_param<unsigned>(0), get_param<unsigned>(1));
        case WAIT_TRAIN:
-               return format("wait for train %d at %s", get_param<unsigned>(0), get_param<string>(1));
+               return format("wait for train %d at sensor %d", get_param<unsigned>(0), get_param<unsigned>(1));
        case ARRIVE:
                return "travel until arrival";
        case SPEED:
@@ -384,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");
 }
 
 
@@ -397,7 +412,6 @@ 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);
@@ -445,11 +459,6 @@ 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));