X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftimetable.cpp;h=9fd44df6d80a480b6d9eb95e9a3cec1cc82e6550;hb=66c2c7ca5a4bd369293959bc211b040834343381;hp=c2a86a6e23db26d4da3dda44de08d79e715b7a2c;hpb=d3a7a9e9ad694d52ccca8b6038501772fdc1dfd5;p=r2c2.git

diff --git a/source/libr2c2/timetable.cpp b/source/libr2c2/timetable.cpp
index c2a86a6..9fd44df 100644
--- 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"
@@ -31,7 +24,7 @@ Timetable::Timetable(Train &t):
 	train.signal_advanced.connect(sigc::mem_fun(this, &Timetable::train_advanced));
 	train.signal_arrived.connect(sigc::mem_fun(this, &Timetable::train_arrived));
 	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];
 }
 
@@ -104,9 +97,15 @@ void Timetable::tick(const Time::TimeStamp &t, const Time::TimeDelta &)
 				set_enabled(false);
 			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)).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();
@@ -127,9 +126,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)).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:
 			if(!arrived)
@@ -181,14 +187,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 +207,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,6 +224,9 @@ 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;
@@ -219,6 +234,9 @@ void Timetable::train_advanced(Block &block)
 
 void Timetable::train_arrived()
 {
+	if(rows.empty() || !enabled)
+		return;
+
 	Row &row = rows[current_row];
 	if(row.type==ARRIVE)
 	{
@@ -245,7 +263,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 +284,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 +402,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");
 }