Check track iterators for validity before using

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

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index dd91d219ab21f22be20b156348c2c17bb6643875..8b469b52fd848feb52f09c07346a521780c1d8ca 100644 (file)
--- a/source/libr2c2/timetable.cpp
+++ b/source/libr2c2/timetable.cpp
@@ -25,7 +25,8 @@ Timetable::Timetable(Train &t):
        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));
@@ -90,10 +91,12 @@ void Timetable::tick(const Time::TimeStamp &t)
                switch(row.type)
                {
                case GOTO_SENSOR:
+                       arrived = false;
                        if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
                                set_enabled(false);
                        break;
                case GOTO_ZONE:
+                       arrived = false;
                        if(!train.go_to(get_zone(row.get_param<string>(0))))
                                set_enabled(false);
                        break;
@@ -106,16 +109,28 @@ void Timetable::tick(const Time::TimeStamp &t)
                        wait_timeout = t+row.get_param<unsigned>(0)*Time::sec;
                        executing = false;
                        break;
+               case WAIT_UNTIL:
+                       {
+                               unsigned unixtime = t.to_unixtime();
+                               unsigned mod = row.get_param<unsigned>(1);
+                               unsigned secs = ((mod+row.get_param<unsigned>(0))-(unixtime%mod))%mod;
+                               wait_timeout = t+secs*Time::sec;
+                               executing = false;
+                       }
+                       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;
                        break;
                case ARRIVE:
-                       executing = false;
+                       if(!arrived)
+                               executing = false;
+                       arrived = false;
                        break;
                case SPEED:
-                       train.set_control("speed", row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale());
+                       if(!arrived)
+                               train.set_control("speed", row.get_param<unsigned>(0)/3.6*train.get_layout().get_catalogue().get_scale());
                        break;
                case REVERSE:
                        train.set_control("reverse", !train.get_control("reverse"));
@@ -170,6 +185,8 @@ void Timetable::train_arrived()
                current_row = (current_row+1)%rows.size();
                executing = true;
        }
+       else
+               arrived = true;
 }
 
 
@@ -201,9 +218,11 @@ string Timetable::Row::str() const
        case GOTO_ZONE:
                return "set route to "+get_param<string>(0);
        case TRAVEL:
-               return "travel to "+get_param<string>(0);
+               return format("travel to sensor %d", get_param<unsigned>(0));
        case WAIT_TIME:
                return format("wait for %d seconds", get_param<unsigned>(0));
+       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));
        case ARRIVE:
@@ -228,9 +247,11 @@ DataFile::Statement Timetable::Row::save() const
        case GOTO_ZONE:
                return DataFile::Statement("goto_zone"), get_param<string>(0);
        case TRAVEL:
-               return DataFile::Statement("travel"), get_param<string>(0);
+               return DataFile::Statement("travel"), get_param<unsigned>(0);
        case WAIT_TIME:
                return DataFile::Statement("wait"), get_param<unsigned>(0);
+       case WAIT_UNTIL:
+               return DataFile::Statement("wait_until"), get_param<unsigned>(0), get_param<unsigned>(1);
        case WAIT_TRAIN:
                return DataFile::Statement("wait_train"), get_param<unsigned>(0), get_param<unsigned>(1);
        case ARRIVE:
@@ -275,6 +296,27 @@ Timetable::Row Timetable::Row::parse(const string &s)
                        }
                }
        }
+       else if(!s.compare(0, 11, "wait until "))
+       {
+               string::size_type mod = s.find(" mod ", 11);
+               unsigned nondigit = (mod!=string::npos ? mod+5 : 11);
+               while(nondigit<s.size() && isdigit(s[nondigit]))
+                       ++nondigit;
+               if(mod!=string::npos)
+               {
+                       unsigned time = lexical_cast<unsigned>(s.substr(11, mod-11));
+                       Row row(WAIT_UNTIL, time);
+                       row.params.push_back(lexical_cast<unsigned>(s.substr(mod+5, nondigit-mod-5)));
+                       return row;
+               }
+               else
+               {
+                       unsigned time = lexical_cast<unsigned>(s.substr(11, nondigit-11));
+                       Row row(WAIT_UNTIL, time);
+                       row.params.push_back(3600);
+                       return row;
+               }
+       }
        else if(!s.compare(0, 10, "set speed "))
        {
                unsigned nondigit = 11;
@@ -312,6 +354,7 @@ Timetable::Loader::Loader(Timetable &tt):
        add("travel",      &Loader::travel);
        add("wait",        &Loader::wait);
        add("wait_train",  &Loader::wait_train);
+       add("wait_until",  &Loader::wait_until);
 
        // Deprecated alias
        add("goto",        static_cast<void (Loader::*)(const string &)>(&Loader::goto_sensor));
@@ -353,9 +396,9 @@ void Timetable::Loader::speed(unsigned s)
        obj.rows.push_back(Row(SPEED, s));
 }
 
-void Timetable::Loader::travel(const string &t)
+void Timetable::Loader::travel(unsigned s)
 {
-       obj.rows.push_back(Row(TRAVEL, t));
+       obj.rows.push_back(Row(TRAVEL, s));
 }
 
 void Timetable::Loader::wait(unsigned t)
@@ -370,4 +413,11 @@ void Timetable::Loader::wait_train(unsigned t, unsigned s)
        obj.rows.push_back(row);
 }
 
+void Timetable::Loader::wait_until(unsigned t, unsigned m)
+{
+       Row row(WAIT_UNTIL, t);
+       row.params.push_back(m);
+       obj.rows.push_back(row);
+}
+
 } // namespace R2C2