#include "route.h"
#include "trackiter.h"
#include "train.h"
+#include "trackchain.h"
#include "trainrouteplanner.h"
#include "trainrouter.h"
-#include "zone.h"
using namespace std;
using namespace Msp;
TrainRouter::TrainRouter(Train &t):
TrainAI(t),
priority(0),
- arriving(false),
- dest_zone(0),
- dest_block(0),
+ arriving(0),
+ destination(0),
update_pending(false)
{
train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved));
bool TrainRouter::set_route(const Route *r)
{
- train.free_noncritical_blocks();
+ BlockIter fncb = train.get_first_noncritical_block();
Route *lead = 0;
if(r && train.is_placed())
{
const BlockAllocator &allocator = train.get_block_allocator();
TrackIter first = allocator.first().track_iter();
- TrackIter next = allocator.last().next().track_iter();
+ TrackIter next = fncb.track_iter();
if(!r->has_track(*next))
{
lead = Route::find(next, *r);
if(r)
routes.push_back(r);
train.stop_at(0);
- arriving = false;
+ arriving = 0;
- train.reserve_more();
+ /* TODO destination should also be cleared when manually setting a different
+ route, but not when the planner calls this. */
+ if(!r)
+ {
+ destination = 0;
+ waypoints.clear();
+ }
+
+ train.refresh_blocks_from(*fncb);
const Route *route = get_route();
signal_route_changed.emit(route);
return routes.front();
}
-void TrainRouter::set_destination(const Zone &zone)
+void TrainRouter::set_destination(const TrackChain &d)
{
- dest_zone = &zone;
- dest_block = 0;
+ destination = &d;
update_pending = true;
}
-void TrainRouter::set_destination(const Block &block)
+bool TrainRouter::is_destination(Track &track) const
+{
+ if(destination)
+ return destination->has_track(track);
+ else
+ return false;
+}
+
+void TrainRouter::add_waypoint(const TrackChain &wp)
{
- dest_zone = 0;
- dest_block = █
+ waypoints.push_back(&wp);
update_pending = true;
}
-bool TrainRouter::has_destination() const
+bool TrainRouter::is_waypoint(unsigned index, Track &track) const
{
- return dest_zone || dest_block;
+ if(index>=waypoints.size())
+ throw out_of_range("TrainRouter::is_waypoint");
+
+ return waypoints[index]->has_track(track);
}
-bool TrainRouter::is_destination(Track &track) const
+void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
{
- if(dest_zone)
- return dest_zone->has_track(track);
- else if(dest_block)
- return dest_block->has_track(track);
- else
- return false;
+ delay = d;
+ update_pending = true;
}
void TrainRouter::message(const Message &msg)
}
else if(msg.type=="clear-route")
set_route(0);
- else if(msg.type=="set-destination-block")
+ else if(msg.type=="set-destination")
{
- if(msg.value.check_type<Block *>())
- set_destination(*msg.value.value<Block *>());
+ if(msg.value.check_type<TrackChain *>())
+ set_destination(*msg.value.value<TrackChain *>());
else
- set_destination(*msg.value.value<const Block *>());
+ set_destination(*msg.value.value<const TrackChain *>());
}
- else if(msg.type=="set-destination-zone")
+ else if(msg.type=="add-waypoint")
{
- if(msg.value.check_type<Zone *>())
- set_destination(*msg.value.value<Zone *>());
+ if(msg.value.check_type<TrackChain *>())
+ add_waypoint(*msg.value.value<TrackChain *>());
else
- set_destination(*msg.value.value<const Zone *>());
+ add_waypoint(*msg.value.value<const TrackChain *>());
}
+ else if(msg.type=="set-departure-delay")
+ set_departure_delay(msg.value.value<Time::TimeDelta>());
}
-void TrainRouter::tick(const Time::TimeStamp &, const Time::TimeDelta &)
+void TrainRouter::tick(const Time::TimeDelta &dt)
{
+ if(delay)
+ {
+ delay -= dt;
+ if(delay<=Time::zero)
+ delay = Time::zero;
+ }
+
if(update_pending)
create_plans(train.get_layout());
- if(arriving && !train.get_speed())
+ if(arriving==1 && !train.get_speed())
{
- train.set_active(false);
signal_arrived.emit();
signal_event.emit(Message("arrived"));
- set_route(0);
+ arriving = 2;
}
+ else if(arriving==2 && !train.get_block_allocator().is_active())
+ set_route(0);
}
void TrainRouter::save(list<DataFile::Statement> &st) const
return;
}
- BlockIter b_iter(&block, t->get_block_allocator().get_entry_to_block(block));
+ BlockIter b_iter = t->get_block_allocator().iter_for(block);
RouteList::iterator route = routes.begin();
if(advance_route(route, block))
{
// Check if the block is a turnout and set it to proper path
- if(unsigned tid = block.get_turnout_id())
+ if(unsigned taddr = block.get_turnout_address())
{
- int path = (*route)->get_turnout(tid);
+ int path = (*route)->get_turnout(taddr);
if(path>=0)
b_iter.track_iter()->set_active_path(path);
}
void TrainRouter::train_advanced(Block &block)
{
+ BlockIter b_iter = train.get_block_allocator().iter_for(block);
+
// Check if we've reached the next route
if(routes.size()>1)
{
- unsigned entry = train.get_block_allocator().get_entry_to_block(block);
- Track &track = *block.get_endpoint(entry).track;
const Route &route = **++routes.begin();
- if(route.has_track(track))
+ if(route.has_track(*b_iter.endpoint().track))
{
routes.pop_front();
// XXX Exceptions?
if(!routes.empty())
{
- BlockIter iter(&block, train.get_block_allocator().get_entry_to_block(block));
- iter = iter.next();
- if(iter && !is_on_route(*iter))
- arriving = true;
+ b_iter = b_iter.next();
+ if(b_iter && !is_on_route(*b_iter))
+ arriving = 1;
}
}
projects / r2c2.git / blobdiff