#include <algorithm>
#include <cmath>
#include <msp/core/maputils.h>
+#include <msp/core/raii.h>
#include <msp/strings/format.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
-#include "aicontrol.h"
+#include "beamgate.h"
+#include "block.h"
#include "catalogue.h"
#include "driver.h"
#include "layout.h"
-#include "route.h"
#include "simplecontroller.h"
#include "speedquantizer.h"
#include "timetable.h"
+#include "trackcircuit.h"
#include "trackiter.h"
#include "tracktype.h"
#include "train.h"
#include "trainrouter.h"
#include "vehicle.h"
#include "vehicletype.h"
-#include "zone.h"
using namespace std;
using namespace Msp;
-namespace {
-
-struct SetFlag
-{
- bool &flag;
-
- SetFlag(bool &f): flag(f) { flag = true; }
- ~SetFlag() { flag = false; }
-};
-
-}
-
-
namespace R2C2 {
Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
address(a),
protocol(p),
preceding_train(0),
- cur_blocks_end(blocks.end()),
- clear_blocks_end(blocks.end()),
- pending_block(0),
- reserving(false),
+ allocator(*this),
advancing(false),
controller(new SimpleController),
- active(false),
current_speed_step(0),
speed_changing(false),
reverse(false),
functions(0),
- travel_dist(0),
pure_speed(false),
speed_quantizer(0),
accurate_position(false),
speed_quantizer = new SpeedQuantizer(speed_steps);
vehicles.push_back(new Vehicle(layout, loco_type));
+ vehicles.back()->set_train(this);
layout.add_train(*this);
- layout.get_driver().add_loco(address, protocol, loco_type);
+ loco_id = layout.get_driver().add_loco(address, protocol, loco_type);
layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
- layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
- layout.signal_block_state_changed.connect(sigc::mem_fun(this, &Train::block_state_changed));
-
layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
- const set<Track *> &tracks = layout.get_tracks();
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if((*i)->get_turnout_id())
- (*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), sigc::ref(**i))));
-
controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed));
+
+ allocator.signal_advanced.connect(sigc::mem_fun(this, &Train::advanced));
+ allocator.signal_rear_advanced.connect(signal_rear_advanced);
}
Train::~Train()
Vehicle *veh = new Vehicle(layout, vt);
vehicles.back()->attach_back(*veh);
vehicles.push_back(veh);
+ veh->set_train(this);
+ signal_vehicle_added.emit(vehicles.size()-1, *veh);
}
void Train::remove_vehicle(unsigned i)
throw out_of_range("Train::remove_vehicle");
if(i==0)
throw logic_error("can't remove locomotive");
- delete vehicles[i];
+
+ Vehicle *veh = vehicles[i];
vehicles.erase(vehicles.begin()+i);
+ veh->detach_front();
if(i<vehicles.size())
+ {
+ veh->detach_back();
vehicles[i-1]->attach_back(*vehicles[i]);
+ }
+ signal_vehicle_removed.emit(i, *veh);
+ delete veh;
}
unsigned Train::get_n_vehicles() const
controller->set_control(n, v);
}
-void Train::set_active(bool a)
-{
- if(a==active)
- return;
- if(!a && controller->get_speed())
- throw logic_error("moving");
-
- active = a;
- if(active)
- {
- stop_timeout = Time::TimeStamp();
- reserve_more();
- }
- else
- stop_timeout = Time::now()+2*Time::sec;
-}
-
void Train::set_function(unsigned func, bool state)
{
if(!loco_type.get_functions().count(func))
throw invalid_argument("Train::set_function");
- layout.get_driver().set_loco_function(address, func, state);
+ layout.get_driver().set_loco_function(loco_id, func, state);
}
float Train::get_control(const string &ctrl) const
return controller->get_speed();
}
+float Train::get_maximum_speed() const
+{
+ float ms = 0;
+ for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ {
+ float vms = (*i)->get_type().get_maximum_speed();
+ if(ms<=0 || (vms>0 && vms<ms))
+ ms = vms;
+ }
+ return ms;
+}
+
bool Train::get_function(unsigned func) const
{
return (functions>>func)&1;
ais.erase(i);
}
-TrainAI *Train::get_tagged_ai(const string &tag) const
-{
- for(list<TrainAI *>::const_iterator i=ais.begin(); i!=ais.end(); ++i)
- if((*i)->get_tag()==tag)
- return *i;
-
- return 0;
-}
-
void Train::ai_message(const TrainAI::Message &msg)
{
for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
(*i)->message(msg);
}
-void Train::place(Block &block, unsigned entry)
+bool Train::place(const BlockIter &block)
{
+ if(!block)
+ throw invalid_argument("Train::place");
if(controller->get_speed())
throw logic_error("moving");
- release_blocks();
-
- set_active(false);
accurate_position = false;
+ last_entry_block = BlockIter();
- blocks.push_back(BlockIter(&block, entry));
- if(!block.reserve(this))
+ if(allocator.start_from(block))
{
- blocks.pop_back();
- return;
- }
-
- if(reverse)
- {
- TrackIter track = BlockIter(&block, entry).reverse().track_iter();
- vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_BUFFER);
+ if(reverse)
+ vehicles.front()->place(block.reverse().track_iter(), VehiclePlacement::FRONT_BUFFER);
+ else
+ vehicles.back()->place(block.track_iter(), VehiclePlacement::BACK_BUFFER);
+ return true;
}
else
{
- const Block::Endpoint &bep = block.get_endpoint(entry);
- vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+ unplace();
+ return false;
}
}
if(controller->get_speed())
throw logic_error("moving");
- release_blocks();
-
- set_active(false);
+ allocator.clear();
accurate_position = false;
+ last_entry_block = BlockIter();
for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
(*i)->unplace();
void Train::stop_at(Block *block)
{
- stop_at_block = block;
+ allocator.stop_at(block);
}
-bool Train::free_block(Block &block)
+bool Train::is_block_critical(const Block &block) const
{
- if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3)
- return false;
+ if(allocator.is_block_current(block))
+ return true;
- unsigned nsens = 0;
- for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
- {
- if(i->block()==&block)
- {
- if(nsens<1)
- return false;
- release_blocks(i, blocks.end());
- return true;
- }
- else if((*i)->get_sensor_id())
- ++nsens;
- }
+ BlockIter i = check_critical_blocks(&block);
+ return i.block()==█
+}
- return false;
+BlockIter Train::get_last_critical_block() const
+{
+ return check_critical_blocks(0);
}
-void Train::free_noncritical_blocks()
+BlockIter Train::check_critical_blocks(const Block *check) const
{
- if(blocks.empty())
- return;
+ if(allocator.empty())
+ return BlockIter();
+
+ BlockIter i = allocator.last_current();
if(controller->get_speed()==0)
- {
- release_blocks(cur_blocks_end, blocks.end());
- return;
- }
+ return i;
+
+ BlockIter last = allocator.last();
+ if(i.block()==last.block())
+ return i;
float margin = 10*layout.get_catalogue().get_scale();
float min_dist = controller->get_braking_distance()*1.3+margin;
- Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
-
- TrackIter track(veh.get_track(), veh.get_entry());
- BlockList::iterator block = blocks.begin();
- bool in_rsv = false;
- while(block!=blocks.end() && !(*block)->has_track(*track))
- {
- ++block;
- if(block==cur_blocks_end)
- in_rsv = true;
- }
-
- float dist = veh.get_offset();
- if(reverse)
- track.reverse();
- else
- dist = track->get_type().get_path_length(track->get_active_path())-dist;
- dist -= veh.get_type().get_length()/2;
-
- bool nsens = 0;
- while(1)
+ float dist = 0;
+ bool sensor_seen = false;
+ i = i.next();
+ while(i.block()!=last.block() && i.block()!=check)
{
- track = track.next();
+ dist += i->get_path_length(i.entry());
- if(!(*block)->has_track(*track))
- {
- ++block;
- if(block==cur_blocks_end)
- in_rsv = true;
- if(block==blocks.end())
- return;
+ if(i->get_sensor_address())
+ sensor_seen = true;
- if(dist>min_dist && nsens>0)
- {
- release_blocks(block, blocks.end());
- return;
- }
+ if(dist>min_dist && sensor_seen)
+ break;
- if(in_rsv && (*block)->get_sensor_id())
- ++nsens;
- }
+ BlockIter j = i.next();
+ if(j->get_train()!=this)
+ break;
- dist += track->get_type().get_path_length(track->get_active_path());
+ i = j;
}
-}
-const BlockIter &Train::get_head_block() const
-{
- if(blocks.empty())
- throw logic_error("no blocks");
- return blocks.back();
+ return i;
}
-const BlockIter &Train::get_tail_block() const
+void Train::refresh_blocks_from(Block &block)
{
- if(blocks.empty())
- throw logic_error("no blocks");
- return blocks.front();
-}
-
-int Train::get_entry_to_block(const Block &block) const
-{
- for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if(i->block()==&block)
- return i->entry();
- return -1;
+ if(is_block_critical(block))
+ allocator.rewind_to(*get_last_critical_block().next());
+ else
+ allocator.rewind_to(block);
}
float Train::get_reserved_distance() const
{
- if(blocks.empty())
+ if(allocator.empty())
return 0;
float margin = 0;
- TrackIter next = blocks.back().next().track_iter();
+ TrackIter next = allocator.last().next().track_iter();
if(next && next->get_type().is_turnout())
margin = 15*layout.get_catalogue().get_scale();
- return max(get_reserved_distance_until(0, false)-margin, 0.0f);
+ return max(get_reserved_distance_until(0)-margin, 0.0f);
}
-void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeDelta &dt)
{
- if(!active && stop_timeout && t>=stop_timeout)
+ if(stop_timeout)
{
- release_blocks(cur_blocks_end, blocks.end());
- stop_timeout = Time::TimeStamp();
+ stop_timeout = max(stop_timeout-dt, Time::zero);
+ if(stop_timeout<=Time::zero)
+ allocator.set_active(false);
}
+ travel_time += dt;
+
Driver &driver = layout.get_driver();
+ bool intent_to_move = false;
for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
- (*i)->tick(t, dt);
+ {
+ (*i)->tick(dt);
+ if((*i)->has_intent_to_move())
+ intent_to_move = true;
+ }
+
controller->tick(dt);
float speed = controller->get_speed();
bool moving = speed>0;
bool r = reverse;
if(loco_type.get_swap_direction())
r = !r;
- driver.set_loco_reverse(address, r);
-
- release_blocks(cur_blocks_end, blocks.end());
- reverse_blocks(blocks);
+ driver.set_loco_reverse(loco_id, r);
- reserve_more();
+ allocator.reverse();
+ last_entry_block = BlockIter();
}
if(speed_quantizer)
if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power())
{
speed_changing = true;
- driver.set_loco_speed(address, speed_step);
+ driver.set_loco_speed(loco_id, speed_step);
pure_speed = false;
}
if(moving)
{
- if(!active)
- set_active(true);
+ if(!allocator.is_active())
+ allocator.set_active(true);
Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
- Track *track = vehicle.get_track();
-
- bool ok = false;
- for(BlockList::const_iterator i=blocks.begin(); (!ok && i!=cur_blocks_end); ++i)
- ok = (*i)->has_track(*track);
float d = speed*(dt/Time::sec);
- if(ok)
+ Block &block = vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block();
+ if(allocator.is_block_current(block))
{
SetFlag setf(advancing);
vehicle.advance(reverse ? -d : d);
overshoot_dist += d;
if(overshoot_dist>40*layout.get_catalogue().get_scale())
{
- layout.emergency(name+" has not arrived at sensor");
+ layout.emergency(&block, name+" has not arrived at sensor");
accurate_position = false;
}
}
}
-
- if(!blocks.empty() && !blocks.front()->get_sensor_id())
- {
- float dist = get_reserved_distance_until(&*blocks.front(), true);
-
- if(dist>10*layout.get_catalogue().get_scale())
- {
- Block &block = *blocks.front();
- blocks.pop_front();
- block.reserve(0);
- }
- }
+ else if(intent_to_move && !allocator.is_active())
+ allocator.set_active(true);
+ else if(allocator.is_active() && !intent_to_move && !stop_timeout)
+ stop_timeout = 2*Time::sec;
}
void Train::save(list<DataFile::Statement> &st) const
{
st.push_back((DataFile::Statement("name"), name));
+ const Catalogue &cat = layout.get_catalogue();
for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
if(i!=vehicles.begin())
- st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+ st.push_back((DataFile::Statement("vehicle"), cat.get_name(&(*i)->get_type())));
if(speed_quantizer)
{
st.push_back(ss);
}
- if(!blocks.empty() && cur_blocks_end!=blocks.begin())
{
- BlockList blks(blocks.begin(), BlockList::const_iterator(cur_blocks_end));
- if(reverse)
- reverse_blocks(blks);
-
- BlockIter prev = blks.front().flip();
- st.push_back((DataFile::Statement("block_hint"), prev->get_id()));
-
- for(BlockList::const_iterator i=blks.begin(); i!=blks.end(); ++i)
- st.push_back((DataFile::Statement("block"), (*i)->get_id()));
+ DataFile::Statement ss("blocks");
+ allocator.save(ss.sub);
+ st.push_back(ss);
}
// XXX Need more generic way of saving AI state
signal_control_changed.emit(ctrl.name, ctrl.value);
}
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
+void Train::loco_speed_event(unsigned id, unsigned speed, bool rev)
{
- if(addr==address)
+ if(id==loco_id)
{
current_speed_step = speed;
bool r = reverse;
if(loco_type.get_swap_direction())
r = !r;
if(rev!=r)
- layout.get_driver().set_loco_reverse(address, r);
+ layout.get_driver().set_loco_reverse(loco_id, r);
speed_changing = false;
pure_speed = false;
}
}
-void Train::loco_func_event(unsigned addr, unsigned func, bool state)
+void Train::loco_func_event(unsigned id, unsigned func, bool state)
{
- if(addr==address)
+ if(id==loco_id)
{
if(state)
functions |= 1<<func;
}
}
-void Train::block_state_changed(Block &block, Block::State state)
+void Train::advanced(Block &block, Sensor *sensor)
{
- if(state==Block::MAYBE_ACTIVE)
- {
- // Find the first sensor block from our reserved blocks that isn't this sensor
- BlockList::iterator end;
- unsigned result = 0;
- for(end=cur_blocks_end; end!=blocks.end(); ++end)
- if((*end)->get_sensor_id())
- {
- if(&**end!=&block)
- {
- if(result==0)
- result = 2;
- else if(result==1)
- break;
- }
- else if(result==0)
- result = 1;
- else if(result==2)
- result = 3;
- }
+ if(!sensor || sensor==block.get_sensor())
+ signal_advanced.emit(block);
- if(result==1)
+ if(!sensor)
+ return;
+
+ if(sensor==block.get_sensor())
+ {
+ if(last_entry_block && pure_speed && speed_quantizer)
{
- // Compute speed and update related state
- float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+ float travel_distance = 0;
- if(pure_speed && speed_quantizer && current_speed_step>0 && travel_time_secs>=2)
- speed_quantizer->learn(current_speed_step, travel_dist/travel_time_secs, travel_time_secs);
+ for(BlockIter i=last_entry_block; &*i!=█ i=i.next())
+ travel_distance += i->get_path_length(i.entry());
- travel_dist = 0;
- for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
+ if(travel_distance>0)
{
- travel_dist += (*j)->get_path_length(j->entry());
+ float travel_time_secs = travel_time/Time::sec;
- if(&**j==&block && !advancing)
- {
- TrackIter track = j->track_iter();
- if(reverse)
- {
- track = track.flip();
- vehicles.back()->place(*track, track.entry(), 0, Vehicle::BACK_AXLE);
- }
- else
- vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_AXLE);
- }
+ if(travel_time_secs>=2)
+ speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs);
}
- last_entry_time = Time::now();
+ }
+
+ last_entry_block = allocator.iter_for(block);
+ travel_time = Time::zero;
+ if(!layout.get_driver().is_halted())
+ {
pure_speed = true;
accurate_position = true;
- overshoot_dist = 0;
-
- // Move blocks up to the next sensor to our current blocks
- for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
- signal_advanced.emit(**j);
- cur_blocks_end = end;
-
- // Try to get more blocks if we're moving
- if(active)
- reserve_more();
}
- else if(result==3)
- layout.emergency("Sensor for "+name+" triggered out of order");
- }
- else if(state==Block::INACTIVE)
- {
- const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
+ overshoot_dist = 0;
- // Find the first sensor in our current blocks that's still active
- BlockList::iterator end = blocks.begin();
- for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
+ if(!advancing && vehicles.front()->is_placed())
{
- if((*i)->has_track(*veh.get_track()))
- break;
- if((*i)->get_sensor_id())
+ TrackIter track = last_entry_block.track_iter();
+ if(reverse)
{
- if(layout.get_driver().get_sensor((*i)->get_sensor_id()))
- break;
- else
- {
- end = i;
- ++end;
- }
+ track = track.flip();
+ vehicles.back()->place(track, VehiclePlacement::BACK_AXLE);
}
- }
-
- if(end!=blocks.begin() && end!=cur_blocks_end)
- // Free blocks up to the last inactive sensor
- release_blocks(blocks.begin(), end);
- }
-}
-
-void Train::turnout_path_changed(Track &track)
-{
- for(list<BlockIter>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving)
- {
- if(&**i==pending_block)
- reserve_more();
else
- check_turnout_paths(false);
+ vehicles.front()->place(track, VehiclePlacement::FRONT_AXLE);
}
-}
-
-void Train::halt_event(bool h)
-{
- if(h)
- accurate_position = false;
-}
-
-void Train::block_reserved(const Block &block, const Train *train)
-{
- if(&block==pending_block && !train && !reserving)
- reserve_more();
-}
-
-void Train::reserve_more()
-{
- if(!active || blocks.empty())
- return;
-
- BlockIter start = blocks.back();
- if(&*start==stop_at_block)
- return;
-
- pending_block = 0;
- preceding_train = 0;
-
- // See how many sensor blocks and how much track we already have
- unsigned nsens = 0;
- float dist = 0;
- for(BlockList::const_iterator i=cur_blocks_end; i!=blocks.end(); ++i)
- {
- if((*i)->get_sensor_id())
- ++nsens;
- if(nsens>0)
- dist += (*i)->get_path_length(i->entry());
}
-
- float approach_margin = 50*layout.get_catalogue().get_scale();
- float min_dist = controller->get_braking_distance()*1.3+approach_margin*2;
-
- BlockIter block = start;
-
- SetFlag setf(reserving);
-
- while(1)
+ else if(BeamGate *gate = dynamic_cast<BeamGate *>(sensor))
{
- BlockIter last = block;
- block = block.next();
- if(!block || block->get_endpoints().size()<2)
- // The track ends here
- break;
-
- if(block->get_turnout_id() && !last->get_turnout_id())
- {
- /* We are arriving at a turnout. See if we have enough blocks and
- distance reserved. */
- if(nsens>=3 && dist>=min_dist)
- break;
- }
-
- blocks.push_back(block);
- if(!block->reserve(this))
+ if(!advancing && vehicles.front()->is_placed())
{
- blocks.pop_back();
- pending_block = &*block;
- break;
- }
-
- if(cur_blocks_end==blocks.end())
- --cur_blocks_end;
- if(clear_blocks_end==blocks.end())
- --clear_blocks_end;
-
- TrackIter track = block.track_iter();
- if(track->is_path_changing())
- {
- pending_block = &*block;
- break;
+ TrackIter track = allocator.iter_for(block).track_iter();
+ for(; (track && &track->get_block()==&block); track=track.next())
+ if(track.track()==gate->get_track())
+ {
+ if(reverse)
+ track = track.reverse();
+ float offset = gate->get_offset_from_endpoint(track.entry());
+ if(reverse)
+ vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER);
+ else
+ vehicles.front()->place(TrackOffsetIter(track, offset), VehiclePlacement::FRONT_BUFFER);
+ break;
+ }
}
-
- if(&*block==stop_at_block)
- break;
-
- if(block->get_sensor_id())
- ++nsens;
- if(nsens>0)
- dist += block->get_path_length(block.entry());
}
-
- check_turnout_paths(true);
-
- // Make any sensorless blocks at the beginning immediately current
- while(cur_blocks_end!=clear_blocks_end && !(*cur_blocks_end)->get_sensor_id())
- ++cur_blocks_end;
}
-void Train::check_turnout_paths(bool set)
+void Train::halt_event(bool h)
{
- if(clear_blocks_end==blocks.end())
- return;
-
- for(list<BlockIter>::iterator i=clear_blocks_end; i!=blocks.end(); ++i)
- {
- if((*i)->get_turnout_id())
- {
- TrackIter track = i->track_iter();
- const TrackType::Endpoint &track_ep = track.endpoint();
-
- unsigned path = 0;
- list<BlockIter>::iterator j = i;
- if(++j!=blocks.end())
- {
- TrackIter rev = j->track_iter().flip();
- unsigned mask = rev.endpoint().paths&track_ep.paths;
- for(path=0; mask>1; mask>>=1, ++path) ;
- }
- else
- return;
-
- if(path!=track->get_active_path())
- {
- if(set && !track->is_path_changing())
- {
- track->set_active_path(path);
- if(track->is_path_changing())
- continue;
- }
- else
- continue;
- }
- }
-
- if(i==clear_blocks_end)
- ++clear_blocks_end;
- if(i==cur_blocks_end && !(*i)->get_sensor_id())
- ++cur_blocks_end;
- }
+ if(h)
+ accurate_position = false;
}
-float Train::get_reserved_distance_until(const Block *until_block, bool back) const
+float Train::get_reserved_distance_until(const Block *until_block) const
{
- if(blocks.empty())
+ if(allocator.empty())
return 0;
- Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
- const VehicleType &vtype = veh.get_type();
+ Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
- TrackIter track(veh.get_track(), veh.get_entry());
+ TrackOffsetIter track = veh.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE);
if(!track) // XXX Probably unnecessary
return 0;
- BlockList::const_iterator block = blocks.begin();
- while(block!=clear_blocks_end && !(*block)->has_track(*track))
- ++block;
- if(block==clear_blocks_end || &**block==until_block)
+ if(&track->get_block()==until_block)
return 0;
- float result = veh.get_offset();
- if(reverse!=back)
+ // Account for the vehicle's offset on its current track
+ float result = track.offset();
+ if(reverse)
track = track.reverse();
else
- result = track->get_type().get_path_length(track->get_active_path())-result;
- result -= vtype.get_length()/2;
+ result = track->get_path_length()-result;
+ result -= veh.get_type().get_length()/2;
- while(1)
- {
- track = track.next();
- if(!track)
- break;
-
- if(!(*block)->has_track(*track))
- {
- if(back)
- {
- if(block==blocks.begin())
- break;
- --block;
- }
- else
- {
- ++block;
- if(block==clear_blocks_end)
- break;
- }
+ BlockIter block = track.block_iter();
- if(&**block==until_block)
- break;
- }
+ // Count remaining distance in the vehicle's current block
+ for(track=track.next(); &track->get_block()==&*block; track=track.next())
+ result += track->get_path_length();
- result += track->get_type().get_path_length(track->get_active_path());
- }
+ const BlockIter &last = allocator.last();
+ if(&*block==&*last)
+ return result;
- return result;
-}
-
-void Train::release_blocks()
-{
- release_blocks(blocks.begin(), blocks.end());
-}
-
-void Train::release_blocks(BlockList::iterator begin, BlockList::iterator end)
-{
- while(begin!=end)
+ // Count any remaining blocks
+ for(block=block.next(); (&*block!=until_block && block->get_train()==this); block=block.next())
{
- if(begin==cur_blocks_end)
- cur_blocks_end = end;
- if(begin==clear_blocks_end)
- clear_blocks_end = end;
-
- Block &block = **begin;
- blocks.erase(begin++);
- block.reserve(0);
+ result += block->get_path_length(block.entry());
+
+ if(&*block==&*last)
+ break;
}
-}
-void Train::reverse_blocks(BlockList &blks) const
-{
- blks.reverse();
- for(BlockList::iterator i=blks.begin(); i!=blks.end(); ++i)
- *i = i->reverse();
+ return result;
}
prev_block(0),
blocks_valid(true)
{
- add("block", &Loader::block);
- add("block_hint", &Loader::block_hint);
+ add("blocks", &Loader::blocks);
add("name", &Loader::name);
add("quantized_speed", &Loader::quantized_speed);
add("router", &Loader::router);
void Train::Loader::finish()
{
- if(!obj.blocks.empty())
+ if(!obj.allocator.empty())
{
- TrackIter track = obj.blocks.front().track_iter();
+ TrackIter track = obj.allocator.first().track_iter();
float offset = 2*obj.layout.get_catalogue().get_scale();
- obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER);
- }
-}
-
-void Train::Loader::block(unsigned id)
-{
- if(!blocks_valid)
- return;
-
- Block *blk;
- try
- {
- blk = &obj.layout.get_block(id);
+ obj.vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER);
}
- catch(const key_error &)
- {
- blocks_valid = false;
- return;
- }
-
- int entry = -1;
- if(prev_block)
- entry = blk->get_endpoint_by_link(*prev_block);
- if(entry<0)
- entry = 0;
-
- obj.blocks.push_back(BlockIter(blk, entry));
- blk->reserve(&obj);
-
- if(blk->get_sensor_id())
- obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true);
-
- prev_block = blk;
}
-void Train::Loader::block_hint(unsigned id)
+void Train::Loader::blocks()
{
- try
- {
- prev_block = &obj.layout.get_block(id);
- }
- catch(const key_error &)
- {
- blocks_valid = false;
- }
+ load_sub(obj.allocator);
}
void Train::Loader::name(const string &n)
void Train::Loader::timetable()
{
Timetable *ttbl = new Timetable(obj);
- load_sub(*ttbl);
+ load_sub(*ttbl, obj.layout);
}
-void Train::Loader::vehicle(ArticleNumber art_nr)
+void Train::Loader::vehicle(const string &n)
{
- const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr);
+ const VehicleType &vtype = obj.layout.get_catalogue().get<VehicleType>(n);
Vehicle *veh = new Vehicle(obj.layout, vtype);
obj.vehicles.back()->attach_back(*veh);
obj.vehicles.push_back(veh);
+ veh->set_train(&obj);
}
} // namespace R2C2
projects / r2c2.git / blobdiff