+#include <algorithm>
#include <msp/strings/format.h>
+#include "aicontrol.h"
#include "clock.h"
#include "layout.h"
#include "timetable.h"
#include "train.h"
+#include "trainrouter.h"
#include "zone.h"
using namespace std;
Timetable::Timetable(Train &t):
TrainAI(t),
current_row(rows.end()),
- update_pending(false)
+ update_pending(false),
+ sync_to_clock(true)
{
+ if(!train.get_ai_of_type<AIControl>())
+ new AIControl(train);
+ if(!train.get_ai_of_type<TrainRouter>())
+ new TrainRouter(train);
+
train.signal_ai_event.connect(sigc::mem_fun(this, &Timetable::event));
}
}
}
-void Timetable::check_update(list<Row>::const_iterator i)
+void Timetable::check_update(const list<Row>::const_iterator &i)
{
for(list<Row>::const_iterator j=current_row; (j!=rows.end() && j!=i); ++j)
if(j->type==ARRIVE)
update_pending = true;
}
+list<Timetable::Row>::iterator Timetable::find_trip(const list<Row>::iterator &begin, list<Row>::iterator *arrive)
+{
+ list<Row>::iterator i = find_if(begin, rows.end(), RowTypeMatch(DEPART));
+ if(i==rows.end())
+ return i;
+
+ list<Row>::iterator j = find_if(i, rows.end(), RowTypeMatch(ARRIVE));
+ if(j==rows.end())
+ return j;
+
+ if(arrive)
+ *arrive = j;
+ return i;
+}
+
void Timetable::update_route()
{
update_pending = false;
if(rows.empty())
return;
- list<Row>::iterator depart = rows.end();
- for(list<Row>::iterator i=current_row;; )
- {
- if(i==rows.end())
- {
- i = rows.begin();
- depart = rows.end();
- }
+ const Clock &clock = train.get_layout().get_clock();
- if(i->type==DEPART)
- depart = i;
- else if(depart!=rows.end() && i->type==ARRIVE)
- break;
+ if(sync_to_clock)
+ {
+ sync_to_clock = false;
+ current_row = rows.begin();
+ for(list<Row>::iterator i=rows.begin(); i!=rows.end(); ++i)
+ if(i->type==DEPART && i->time>=clock.get_current_time())
+ {
+ current_row = i;
+ break;
+ }
+ }
- ++i;
- if(i==current_row)
+ list<Row>::iterator arrive;
+ list<Row>::iterator depart = find_trip(current_row, &arrive);
+ if(depart==rows.end())
+ {
+ depart = find_trip(rows.begin(), &arrive);
+ if(depart==rows.end())
{
current_row = rows.end();
return;
current_row = depart;
for(list<Row>::const_iterator i=depart; i!=rows.end(); ++i)
{
- if(i->type==ARRIVE)
- {
- train.ai_message(Message("set-destination-zone", i->zone));
- break;
- }
- else if(i->type==DEPART)
+ if(i->type==DEPART)
{
- const Clock &clock = train.get_layout().get_clock();
Time::TimeDelta dt = i->time-clock.get_current_time();
while(dt<Time::zero)
dt += Time::day;
- dt /= clock.get_rate();
- train.ai_message(Message("set-departure-delay", dt));
+ train.ai_message(Message("set-departure-delay", dt/clock.get_rate()));
+ }
+ else
+ {
+ train.ai_message(Message("add-waypoint", TrainRouter::Waypoint(*i->target, i->direction)));
+ if(i->type==ARRIVE)
+ break;
}
}
+
+ list<Row>::iterator next_depart = find_trip(arrive, 0);
+ if(next_depart==rows.end())
+ next_depart = find_trip(rows.begin(), 0);
+ if(next_depart!=rows.end())
+ {
+ Time::TimeDelta dt = next_depart->time-depart->time;
+ while(dt<=Time::zero)
+ dt += Time::day;
+ train.ai_message(Message("set-trip-duration", dt/clock.get_rate()));
+ }
}
void Timetable::event(TrainAI &, const Message &msg)
if(msg.type=="arrived")
{
if(current_row->type==ARRIVE)
+ record_time();
+ update_pending = true;
+ }
+ else if(msg.type=="waypoint-reached")
+ {
+ const TrackChain *wp = msg.value.value<const TrackChain *>();
+ if(current_row->type==THROUGH && current_row->target==wp)
{
- current_row->time = train.get_layout().get_clock().get_current_time();
- unsigned i = distance(rows.begin(), current_row);
- signal_row_modified.emit(i, *current_row);
+ record_time();
+ ++current_row;
}
- update_pending = true;
}
}
+void Timetable::record_time()
+{
+ current_row->time = train.get_layout().get_clock().get_current_time();
+ unsigned i = distance(rows.begin(), current_row);
+ signal_row_modified.emit(i, *current_row);
+}
+
Timetable::Row::Row():
type(ARRIVE),
- zone(0)
+ target(0),
+ direction(TrackChain::UNSPECIFIED)
{ }
void Timetable::Row::save(list<DataFile::Statement> &st) const
{
st.push_back((DataFile::Statement("type"), type));
st.push_back((DataFile::Statement("time"), time.raw()));
- st.push_back((DataFile::Statement("zone"), zone->get_group(), zone->get_number()));
+ st.push_back(target->save_reference());
+ if(direction)
+ st.push_back((DataFile::Statement("direction"), direction));
}
DataFile::ObjectLoader<Timetable::Row>(r),
layout(l)
{
- add("zone", &Loader::zone);
+ add("block", &Loader::block);
+ add("direction", &Row::direction);
add("time", &Loader::time);
add("type", &Row::type);
+ add("zone", &Loader::zone);
+ add("zone", &Loader::zone_numbered);
}
-void Timetable::Row::Loader::zone(const string &name, unsigned number)
+void Timetable::Row::Loader::block(unsigned id)
{
- obj.zone = &layout.get_zone(name, number);
+ obj.target = &layout.get_block(id);
}
void Timetable::Row::Loader::time(Time::RawTime t)
obj.time = Time::TimeDelta(t);
}
+void Timetable::Row::Loader::zone(const string &name)
+{
+ zone_numbered(name, 0);
+}
+
+void Timetable::Row::Loader::zone_numbered(const string &name, unsigned number)
+{
+ obj.target = &layout.get_zone(name, number);
+}
+
void operator<<(LexicalConverter &conv, Timetable::RowType rt)
{
{
case Timetable::ARRIVE: conv.result("ARRIVE"); return;
case Timetable::DEPART: conv.result("DEPART"); return;
+ case Timetable::THROUGH: conv.result("THROUGH"); return;
default: throw lexical_error(format("conversion of RowType(%d) to string", rt));
}
}
rt = Timetable::ARRIVE;
else if(conv.get()=="DEPART")
rt = Timetable::DEPART;
+ else if(conv.get()=="THROUGH")
+ rt = Timetable::THROUGH;
else
throw lexical_error(format("conversion of '%s' to RowType", conv.get()));
}
projects / r2c2.git / blobdiff