]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/timetable.cpp
Fix some stuff in Timetable
[r2c2.git] / source / libr2c2 / timetable.cpp
index bc8ebe6c43012d628b695ff1ba036f5022489c7f..dcdbb00bbc66c5f78dd21fcd4cb426131d6b3171 100644 (file)
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
+Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -20,15 +20,19 @@ using namespace Msp;
 namespace R2C2 {
 
 Timetable::Timetable(Train &t):
-       train(t),
+       TrainAI(t),
        enabled(false),
        current_row(0),
        executing(true),
        pending_block(0),
-       pending_train(0)
+       pending_train(0),
+       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.get_layout().get_driver().signal_sensor.connect(sigc::mem_fun(this, &Timetable::sensor_event));
+       Layout &layout = train.get_layout();
+       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));
 }
 
 void Timetable::set_enabled(bool e)
@@ -72,7 +76,7 @@ const Timetable::Row &Timetable::get_row(unsigned i) const
        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;
@@ -89,32 +93,71 @@ 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:
+                       arrived = false;
+                       if(!train.go_to(get_sensor(row.get_param<unsigned>(0))))
                                set_enabled(false);
                        break;
-               case TRAVEL:
-                       pending_block = &parse_location(row.get_param<string>(0));
-                       pending_train = &train;
+               case GOTO_ZONE:
+                       arrived = false;
+                       if(!train.go_to(get_zone(row.get_param<string>(0))))
+                               set_enabled(false);
+                       break;
+               case TRAVEL_TO:
+                       {
+                               Block *block = &get_sensor(row.get_param<unsigned>(0)).get_block();
+                               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();
+                       pending_train = (pending_block->get_train()==&train ? 0 : &train);
                        executing = false;
                        break;
                case WAIT_TIME:
                        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 = &parse_location(row.get_param<string>(1));
-                       executing = false;
+                       {
+                               Train *other_train = &train.get_layout().get_train(row.get_param<unsigned>(0));
+                               Block *block = &get_sensor(row.get_param<unsigned>(1)).get_block();
+                               if(block->get_train()!=other_train || block->get_state()<Block::MAYBE_ACTIVE)
+                               {
+                                       pending_train = other_train;
+                                       pending_block = 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)
+                       {
+                               float speed = row.get_param<unsigned>(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<string>(0))))
@@ -129,20 +172,39 @@ void Timetable::tick(const Time::TimeStamp &t)
 
 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());
 }
 
-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();
 }
 
-void Timetable::sensor_event(unsigned addr, bool state)
+Track &Timetable::get_turnout(unsigned id)
 {
-       if(pending_block && pending_block->get_train()==pending_train && addr==pending_block->get_sensor_id() && state)
+       Block &block = train.get_layout().get_block(id|0x2000);
+       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::block_state_changed(Block &block, Block::State 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();
@@ -150,14 +212,46 @@ 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];
+               if(row.type==TRAVEL_PAST && !pending_train)
+               {
+                       pending_block = 0;
+                       current_row = (current_row+1)%rows.size();
+                       executing = true;
+               }
+       }
+}
+
+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()
 {
+       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;
 }
 
 
@@ -184,14 +278,20 @@ string Timetable::Row::str() const
 {
        switch(type)
        {
-       case GOTO:
+       case GOTO_SENSOR:
+               return format("set route to sensor %d", get_param<unsigned>(0));
+       case GOTO_ZONE:
                return "set route to "+get_param<string>(0);
-       case TRAVEL:
-               return "travel to "+get_param<string>(0);
+       case TRAVEL_TO:
+               return format("travel to sensor %d", get_param<unsigned>(0));
+       case TRAVEL_PAST:
+               return format("travel past turnout %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));
+               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:
@@ -209,14 +309,20 @@ DataFile::Statement Timetable::Row::save() const
 {
        switch(type)
        {
-       case GOTO:
-               return DataFile::Statement("goto"), get_param<string>(0);
-       case TRAVEL:
-               return DataFile::Statement("travel"), 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_TO:
+               return DataFile::Statement("travel_to"), get_param<unsigned>(0);
+       case TRAVEL_PAST:
+               return DataFile::Statement("travel_past"), 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<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 +340,10 @@ 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_TO, lexical_cast<unsigned>(s.substr(17)));
+               else if(!s.compare(7, 13, "past turnout "))
+                       return Row(TRAVEL_PAST, lexical_cast<unsigned>(s.substr(20)));
                else if(!s.compare(7, string::npos, "until arrival"))
                        return Row(ARRIVE);
        }
@@ -250,15 +358,36 @@ 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;
                        }
                }
        }
+       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;
@@ -271,7 +400,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 +416,22 @@ 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", &Loader::goto_sensor);
+       add("goto_zone",   &Loader::goto_zone);
+       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);
+       add("wait_train",  &Loader::wait_train);
+       add("wait_until",  &Loader::wait_until);
+
+       // Deprecated alias
+       add("goto",        &Loader::goto_sensor_str);
+       add("travel",      &Loader::travel_to);
 }
 
 void Timetable::Loader::arrive()
@@ -297,9 +439,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, t));
+       obj.rows.push_back(Row(GOTO_SENSOR, s));
+}
+
+void Timetable::Loader::goto_sensor_str(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_ZONE, z));
 }
 
 void Timetable::Loader::route(const string &r)
@@ -317,9 +470,19 @@ void Timetable::Loader::speed(unsigned s)
        obj.rows.push_back(Row(SPEED, s));
 }
 
-void Timetable::Loader::travel(const string &t)
+void Timetable::Loader::tag(const string &t)
 {
-       obj.rows.push_back(Row(TRAVEL, t));
+       obj.tag = t;
+}
+
+void Timetable::Loader::travel_to(unsigned s)
+{
+       obj.rows.push_back(Row(TRAVEL_TO, s));
+}
+
+void Timetable::Loader::travel_past(unsigned s)
+{
+       obj.rows.push_back(Row(TRAVEL_PAST, s));
 }
 
 void Timetable::Loader::wait(unsigned t)
@@ -327,10 +490,17 @@ 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);
+}
+
+void Timetable::Loader::wait_until(unsigned t, unsigned m)
+{
+       Row row(WAIT_UNTIL, t);
+       row.params.push_back(m);
        obj.rows.push_back(row);
 }