Add support for named zones

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

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index bc8ebe6c43012d628b695ff1ba036f5022489c7f..dd91d219ab21f22be20b156348c2c17bb6643875 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -89,12 +89,16 @@ void Timetable::tick(const Time::TimeStamp &t)
                Row &row = rows[current_row];
                switch(row.type)
                {
-               case GOTO:
-                       if(!train.go_to(**parse_location(row.get_param<string>(0)).get_tracks().begin()))
+               case GOTO_SENSOR:
+                       if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
+                               set_enabled(false);
+                       break;
+               case GOTO_ZONE:
+                       if(!train.go_to(get_zone(row.get_param<string>(0))))
                                set_enabled(false);
                        break;
                case TRAVEL:
-                       pending_block = &parse_location(row.get_param<string>(0));
+                       pending_block = &get_sensor(row.get_param<unsigned>(0)).get_block();
                        pending_train = &train;
                        executing = false;
                        break;
@@ -104,7 +108,7 @@ void Timetable::tick(const Time::TimeStamp &t)
                        break;
                case WAIT_TRAIN:
                        pending_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
-                       pending_block = &parse_location(row.get_param<string>(1));
+                       pending_block = &get_sensor(row.get_param<unsigned>(1)).get_block();
                        executing = false;
                        break;
                case ARRIVE:
@@ -133,11 +137,19 @@ void Timetable::save(list<DataFile::Statement> &st) const
                st.push_back(i->save());
 }
 
-Block &Timetable::parse_location(const string &loc)
+Track &Timetable::get_sensor(unsigned id)
 {
-       if(!loc.compare(0, 7, "sensor "))
-               return train.get_layout().get_block(lexical_cast<unsigned>(loc.substr(7))|0x1000);
-       throw Exception("Named blocks are not supported yet");
+       Block &block = train.get_layout().get_block(id|0x1000);
+       return **block.get_tracks().begin();
+}
+
+Zone &Timetable::get_zone(const string &name)
+{
+       string::size_type space = name.rfind(' ');
+       if(space==string::npos || space==0)
+               throw InvalidParameterValue("Invalid zone name");
+       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)
@@ -184,7 +196,9 @@ string Timetable::Row::str() const
 {
        switch(type)
        {
-       case GOTO:
+       case GOTO_SENSOR:
+               return "set route to sensor "+get_param<unsigned>(0);
+       case GOTO_ZONE:
                return "set route to "+get_param<string>(0);
        case TRAVEL:
                return "travel to "+get_param<string>(0);
@@ -209,14 +223,16 @@ DataFile::Statement Timetable::Row::save() const
 {
        switch(type)
        {
-       case GOTO:
-               return DataFile::Statement("goto"), get_param<string>(0);
+       case GOTO_SENSOR:
+               return DataFile::Statement("goto_sensor"), get_param<unsigned>(0);
+       case GOTO_ZONE:
+               return DataFile::Statement("goto_zone"), get_param<string>(0);
        case TRAVEL:
                return DataFile::Statement("travel"), get_param<string>(0);
        case WAIT_TIME:
                return DataFile::Statement("wait"), get_param<unsigned>(0);
        case WAIT_TRAIN:
-               return DataFile::Statement("wait_train"), get_param<unsigned>(0), get_param<string>(1);
+               return DataFile::Statement("wait_train"), get_param<unsigned>(0), get_param<unsigned>(1);
        case ARRIVE:
                return DataFile::Statement("arrive");
        case SPEED:
@@ -234,8 +250,8 @@ Timetable::Row Timetable::Row::parse(const string &s)
 {
        if(!s.compare(0, 7, "travel "))
        {
-               if(!s.compare(7, 3, "to "))
-                       return Row(TRAVEL, s.substr(10));
+               if(!s.compare(7, 10, "to sensor "))
+                       return Row(TRAVEL, lexical_cast<unsigned>(s.substr(17)));
                else if(!s.compare(7, string::npos, "until arrival"))
                        return Row(ARRIVE);
        }
@@ -250,11 +266,11 @@ Timetable::Row Timetable::Row::parse(const string &s)
                }
                else if(!s.compare(9, 6, "train "))
                {
-                       string::size_type at = s.find(" at ", 15);
+                       string::size_type at = s.find(" at sensor ", 15);
                        if(at!=string::npos)
                        {
                                Row row(WAIT_TRAIN, lexical_cast<unsigned>(s.substr(15, at-15)));
-                               row.params.push_back(s.substr(at+4));
+                               row.params.push_back(lexical_cast<unsigned>(s.substr(at+11)));
                                return row;
                        }
                }
@@ -271,7 +287,12 @@ Timetable::Row Timetable::Row::parse(const string &s)
        else if(!s.compare(0, 10, "set route "))
        {
                if(!s.compare(10, 3, "to "))
-                       return Row(GOTO, s.substr(13));
+               {
+                       if(!s.compare(13, 7, "sensor "))
+                               return Row(GOTO_SENSOR, lexical_cast<unsigned>(s.substr(20)));
+                       else
+                               return Row(GOTO_ZONE, s.substr(13));
+               }
                return Row(ROUTE, s.substr(10));
        }
 
@@ -282,14 +303,18 @@ Timetable::Row Timetable::Row::parse(const string &s)
 Timetable::Loader::Loader(Timetable &tt):
        DataFile::ObjectLoader<Timetable>(tt)
 {
-       add("arrive",  &Loader::arrive);
-       add("goto",    &Loader::go_to);
-       add("route",   &Loader::route);
-       add("speed",   &Loader::speed);
-       add("reverse", &Loader::reverse);
-       add("travel",  &Loader::travel);
-       add("wait",    &Loader::wait);
-       add("wait_train", &Loader::wait_train);
+       add("arrive",      &Loader::arrive);
+       add("goto_sensor", static_cast<void (Loader::*)(unsigned)>(&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("wait",        &Loader::wait);
+       add("wait_train",  &Loader::wait_train);
+
+       // Deprecated alias
+       add("goto",        static_cast<void (Loader::*)(const string &)>(&Loader::goto_sensor));
 }
 
 void Timetable::Loader::arrive()
@@ -297,9 +322,20 @@ void Timetable::Loader::arrive()
        obj.rows.push_back(Row(ARRIVE));
 }
 
-void Timetable::Loader::go_to(const string &t)
+void Timetable::Loader::goto_sensor(unsigned s)
+{
+       obj.rows.push_back(Row(GOTO_SENSOR, s));
+}
+
+void Timetable::Loader::goto_sensor(const string &s)
+{
+       if(!s.compare(0, 7, "sensor "))
+               obj.rows.push_back(Row(GOTO_SENSOR, lexical_cast<unsigned>(s.substr(7))));
+}
+
+void Timetable::Loader::goto_zone(const string &z)
 {
-       obj.rows.push_back(Row(GOTO, t));
+       obj.rows.push_back(Row(GOTO_ZONE, z));
 }
 
 void Timetable::Loader::route(const string &r)
@@ -327,10 +363,10 @@ void Timetable::Loader::wait(unsigned t)
        obj.rows.push_back(Row(WAIT_TIME, t));
 }
 
-void Timetable::Loader::wait_train(unsigned t, const string &b)
+void Timetable::Loader::wait_train(unsigned t, unsigned s)
 {
        Row row(WAIT_TRAIN, t);
-       row.params.push_back(b);
+       row.params.push_back(s);
        obj.rows.push_back(row);
 }