namespace Marklin {
-Train::Train(Layout &l, const VehicleType &t, unsigned a):
+Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
layout(l),
loco_type(t),
address(a),
+ protocol(p),
priority(0),
yielding_to(0),
+ cur_blocks_end(blocks.end()),
+ clear_blocks_end(blocks.end()),
pending_block(0),
reserving(false),
advancing(false),
controller(new AIControl(*this, new SimpleController)),
timetable(0),
active(false),
- current_speed(0),
+ current_speed_step(0),
speed_changing(false),
reverse(false),
functions(0),
status("Unplaced"),
travel_dist(0),
pure_speed(false),
- real_speed(15),
+ real_speed(layout.get_driver().get_protocol_speed_steps(protocol)+1),
accurate_position(false),
overshoot_dist(false)
{
layout.add_train(*this);
- layout.get_driver().add_loco(address);
+ layout.get_driver().add_loco(address, protocol);
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.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
- layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event));
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));
}
free_noncritical_blocks();
Route *lead = 0;
- if(r && !cur_blocks.empty())
+ if(r && !blocks.empty())
{
- TrackIter first = cur_blocks.front().track_iter();
- TrackIter next = (rsv_blocks.empty() ? cur_blocks : rsv_blocks).back().next().track_iter();
+ TrackIter first = blocks.front().track_iter();
+ TrackIter next = blocks.back().next().track_iter();
if(!r->has_track(*next))
{
lead = Route::find(next, *r);
bool Train::go_to(Track &to)
{
- for(BlockList::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ for(BlockList::const_iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
if((*i)->has_track(to))
{
signal_arrived.emit();
free_noncritical_blocks();
- TrackIter next = (rsv_blocks.empty() ? cur_blocks : rsv_blocks).back().next().track_iter();
+ TrackIter next = blocks.back().next().track_iter();
Route *route = Route::find(next, to);
if(!route)
list<RouteRef>::iterator route = routes.begin();
// Follow our routes to find out where we're entering the turnout
- for(TrackLoopIter track = cur_blocks.back().track_iter();;)
+ for(TrackLoopIter track = blocks.front().track_iter();;)
{
if(!advance_route(route, *track))
return false;
int route_path = route->route->get_turnout(from.get_turnout_id());
// Check that more than one path is available
- unsigned ep_paths = track->get_type().get_endpoints()[track.entry()].paths;
+ unsigned ep_paths = track.endpoint().paths;
if(!(ep_paths&(ep_paths-1)))
return false;
break;
}
- unsigned tid = track->get_turnout_id();
- track = track.next(tid ? route->route->get_turnout(tid) : 0);
+ track = track.next(route->route->get_path(*track));
if(!track || track.looped())
return false;
else if(!diversion->has_track(*track))
throw LogicError("Pathfinder returned a bad route");
- unsigned tid = track->get_turnout_id();
- track = track.next(tid ? diversion->get_turnout(tid) : 0);
+ track = track.next(diversion->get_path(*track));
}
if(route==end)
if(controller->get_speed())
throw InvalidState("Must be stopped before placing");
- release_blocks(rsv_blocks);
- release_blocks(cur_blocks);
+ release_blocks();
set_active(false);
accurate_position = false;
return;
}
- cur_blocks.push_back(BlockIter(&block, entry));
+ blocks.push_back(BlockIter(&block, entry));
if(reverse)
{
TrackIter track = BlockIter(&block, entry).reverse().track_iter();
}
else
{
- const Block::Endpoint &bep = block.get_endpoints()[entry];
+ const Block::Endpoint &bep = block.get_endpoint(entry);
vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
}
}
if(controller->get_speed())
throw InvalidState("Must be stopped before unplacing");
- release_blocks(rsv_blocks);
- release_blocks(cur_blocks);
+ release_blocks();
set_active(false);
accurate_position = false;
return false;
unsigned nsens = 0;
- for(BlockList::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
{
if(i->block()==&block)
{
if(nsens<1)
return false;
- release_blocks(rsv_blocks, i, rsv_blocks.end());
+ release_blocks(i, blocks.end());
return true;
}
else if((*i)->get_sensor_id())
void Train::free_noncritical_blocks()
{
- if(cur_blocks.empty() || rsv_blocks.empty())
+ if(blocks.empty())
return;
if(controller->get_speed()==0)
{
- release_blocks(rsv_blocks);
+ release_blocks(cur_blocks_end, blocks.end());
return;
}
Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
TrackIter track(veh.get_track(), veh.get_entry());
- BlockList::iterator block = cur_blocks.begin();
+ BlockList::iterator block = blocks.begin();
bool in_rsv = false;
- while(block!=rsv_blocks.end() && !(*block)->has_track(*track))
+ while(block!=blocks.end() && !(*block)->has_track(*track))
{
++block;
- if(block==cur_blocks.end())
- {
- block = rsv_blocks.begin();
+ if(block==cur_blocks_end)
in_rsv = true;
- }
}
float dist = veh.get_offset();
if(!(*block)->has_track(*track))
{
++block;
- if(block==cur_blocks.end())
- {
- block = rsv_blocks.begin();
+ if(block==cur_blocks_end)
in_rsv = true;
- }
- if(block==rsv_blocks.end())
+ if(block==blocks.end())
return;
if(dist>min_dist && nsens>0)
{
- release_blocks(rsv_blocks, block, rsv_blocks.end());
+ release_blocks(block, blocks.end());
return;
}
int Train::get_entry_to_block(Block &block) const
{
- for(BlockList::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(i->block()==&block)
- return i->entry();
- for(BlockList::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
if(i->block()==&block)
return i->entry();
return -1;
{
if(!active && stop_timeout && t>=stop_timeout)
{
- release_blocks(rsv_blocks);
- end_of_route = false;
+ release_blocks(cur_blocks_end, blocks.end());
stop_timeout = Time::TimeStamp();
}
timetable->tick(t);
controller->tick(dt);
float speed = controller->get_speed();
- unsigned speed_notch = find_speed(speed);
+ unsigned speed_step = find_speed_step(speed);
if(controller->get_reverse()!=reverse)
{
reverse = controller->get_reverse();
driver.set_loco_reverse(address, reverse);
- release_blocks(rsv_blocks);
- reverse_blocks(cur_blocks);
+ release_blocks(cur_blocks_end, blocks.end());
+ reverse_blocks(blocks);
reserve_more();
}
- if(speed_notch!=current_speed && !speed_changing && !driver.is_halted() && driver.get_power())
+ if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power())
{
speed_changing = true;
- driver.set_loco_speed(address, speed_notch);
+ driver.set_loco_speed(address, speed_step);
pure_speed = false;
- if(speed_notch)
+ if(speed_step)
set_status(format("Traveling %d kmh", get_travel_speed()));
else
set_status("Waiting");
Track *track = vehicle.get_track();
bool ok = false;
- for(BlockList::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
+ for(BlockList::const_iterator i=blocks.begin(); (!ok && i!=cur_blocks_end); ++i)
ok = (*i)->has_track(*track);
- float d = get_real_speed(current_speed)*(dt/Time::sec);
+ float d;
+ if(real_speed.size()>1)
+ d = get_real_speed(current_speed_step)*(dt/Time::sec);
+ else
+ d = speed*(dt/Time::sec);
if(ok)
{
SetFlag setf(advancing);
}
}
}
- else if(end_of_route && rsv_blocks.empty())
+ else if(end_of_route && cur_blocks_end==blocks.end())
{
set_active(false);
signal_arrived.emit();
set_route(0);
}
- if(!cur_blocks.empty() && !cur_blocks.front()->get_sensor_id())
+ if(!blocks.empty() && !blocks.front()->get_sensor_id())
{
- float dist = get_reserved_distance_until(&*cur_blocks.front(), true);
+ float dist = get_reserved_distance_until(&*blocks.front(), true);
if(dist>10*layout.get_catalogue().get_scale())
{
- cur_blocks.front()->reserve(0);
- cur_blocks.pop_front();
+ blocks.front()->reserve(0);
+ blocks.pop_front();
}
}
}
if(i!=vehicles.begin())
st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
- for(unsigned i=0; i<=14; ++i)
+ for(unsigned i=0; i<real_speed.size(); ++i)
if(real_speed[i].weight)
st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight));
- if(!cur_blocks.empty())
+ if(!blocks.empty() && cur_blocks_end!=blocks.begin())
{
- BlockList blocks = cur_blocks;
+ BlockList blks(blocks.begin(), BlockList::const_iterator(cur_blocks_end));
if(reverse)
- reverse_blocks(blocks);
+ reverse_blocks(blks);
- BlockIter prev = blocks.front().flip();
+ BlockIter prev = blks.front().flip();
st.push_back((DataFile::Statement("block_hint"), prev->get_id()));
- for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ for(BlockList::const_iterator i=blks.begin(); i!=blks.end(); ++i)
st.push_back((DataFile::Statement("block"), (*i)->get_id()));
}
{
if(addr==address)
{
- current_speed = speed;
+ current_speed_step = speed;
speed_changing = false;
pure_speed = false;
}
if(state)
{
// Find the first sensor block from our reserved blocks that isn't this sensor
- BlockList::iterator i;
+ BlockList::iterator end;
unsigned result = 0;
- for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- if((*i)->get_sensor_id())
+ for(end=cur_blocks_end; end!=blocks.end(); ++end)
+ if((*end)->get_sensor_id())
{
- if((*i)->get_sensor_id()!=addr)
+ if((*end)->get_sensor_id()!=addr)
{
if(result==0)
result = 2;
result = 3;
}
- if(result==1 && i!=rsv_blocks.begin())
+ if(result==1)
{
// Compute speed and update related state
float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
if(pure_speed)
{
- if(current_speed)
+ if(current_speed_step>0)
{
- RealSpeed &rs = real_speed[current_speed];
+ RealSpeed &rs = real_speed[current_speed_step];
rs.add(travel_dist/travel_time_secs, travel_time_secs);
}
set_status(format("Traveling %d kmh", get_travel_speed()));
}
travel_dist = 0;
- for(BlockList::iterator j=rsv_blocks.begin(); j!=i; ++j)
+ for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
{
travel_dist += (*j)->get_path_length(j->entry());
// Check if we've reached the next route
if(routes.size()>1)
{
- const set<Track *> &rtracks = (++routes.begin())->route->get_tracks();
- for(BlockList::iterator j=rsv_blocks.begin(); j!=i; ++j)
- if(rtracks.count((*j)->get_endpoints()[j->entry()].track))
+ const Route &route = *(++routes.begin())->route;
+ for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
+ if(route.has_track(*j->track_iter()))
{
routes.pop_front();
// XXX Exceptions?
}
// Move blocks up to the next sensor to our current blocks
- cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
+ cur_blocks_end = end;
// Try to get more blocks if we're moving
if(active)
const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
// Find the first sensor in our current blocks that's still active
- BlockList::iterator end = cur_blocks.begin();
- for(BlockList::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
+ BlockList::iterator end = blocks.begin();
+ for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
{
if((*i)->has_track(*veh.get_track()))
break;
}
}
- if(end!=cur_blocks.begin() && end!=cur_blocks.end())
+ if(end!=blocks.begin() && end!=cur_blocks_end)
// Free blocks up to the last inactive sensor
- release_blocks(cur_blocks, cur_blocks.begin(), end);
+ release_blocks(blocks.begin(), end);
}
}
-void Train::turnout_event(unsigned addr, bool)
+void Train::turnout_path_changed(Track &track)
{
- if(pending_block && (!pending_block->get_train() || pending_block->get_train()==this))
- {
- unsigned pending_addr = pending_block->get_turnout_id();
- bool double_addr = (*pending_block->get_tracks().begin())->get_type().is_double_address();
- if(addr==pending_addr || (double_addr && addr==pending_addr+1))
- {
- if(reserving)
- pending_block = 0;
- else
- reserve_more();
- }
- }
+ for(list<BlockIter>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving)
+ check_turnout_paths(false);
}
void Train::halt_event(bool h)
reserve_more();
}
-unsigned Train::reserve_more()
+void Train::reserve_more()
{
- if(!active)
- return 0;
+ if(!active || blocks.empty() || end_of_route)
+ return;
- BlockIter start;
- if(!rsv_blocks.empty())
- start = rsv_blocks.back();
- else if(!cur_blocks.empty())
- start = cur_blocks.back();
- else
- return 0;
+ BlockIter start = blocks.back();
pending_block = 0;
// See how many sensor blocks and how much track we already have
unsigned nsens = 0;
float dist = 0;
- for(BlockList::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ 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());
}
-
- if(end_of_route)
- return nsens;
list<RouteRef>::iterator cur_route = routes.begin();
advance_route(cur_route, *start.track_iter());
float min_dist = controller->get_braking_distance()*1.3+approach_margin*2;
BlockIter block = start;
- BlockIter good = start;
+ list<BlockIter>::iterator good_end = blocks.end();
Track *divert_track = 0;
bool try_divert = false;
- unsigned good_sens = nsens;
- float good_dist = dist;
Train *blocking_train = 0;
BlockList contested_blocks;
SetFlag setf(reserving);
- while(good_sens<3 || good_dist<min_dist || !contested_blocks.empty())
+ while(1)
{
BlockIter last = block;
block = block.next(cur_route!=routes.end() ? cur_route->route : 0);
- if(!block)
+ if(!block || block->get_endpoints().size()<2)
+ {
+ if(!blocking_train)
+ good_end = blocks.end();
break;
+ }
TrackIter track = block.track_iter();
// Keep the blocks if we arrived at the end of the route
if(!blocking_train)
{
- good = last;
- good_sens = nsens;
- good_dist = dist;
+ good_end = blocks.end();
end_of_route = true;
}
break;
}
}
- else if(!routes.empty() && routes.front().route->has_track(*track))
- cur_route = routes.begin();
- if(block->get_endpoints().size()<2)
+ if(block->get_turnout_id() && !last->get_turnout_id())
{
- if(!blocking_train)
- {
- good = last;
- good_sens = nsens;
- good_dist = dist;
- }
- break;
+ /* We can keep the blocks if we arrive at a turnout from a non-turnout
+ block. Having a turnout block as our last reserved block is not good
+ as it would limit our diversion possibilities for little benefit. */
+ good_end = blocks.end();
+ if(nsens>=3 && dist>=min_dist)
+ break;
}
if(blocking_train)
if(blocking_train->free_block(*contested_blocks.back()))
{
// Roll back and start actually reserving the blocks
- block = rsv_blocks.back();
+ block = blocks.back();
cur_route = routes.begin();
advance_route(cur_route, *block.track_iter().track());
if(blocking_train->get_priority()==priority)
bool entry_conflict = (block.entry()==other_exit);
bool exit_conflict = (exit==static_cast<unsigned>(other_entry));
if(!entry_conflict && !last->get_turnout_id())
- {
/* The other train is not coming to the blocks we're holding, so we
can keep them. */
- good = last;
- good_sens = nsens;
- good_dist = dist;
- }
+ good_end = blocks.end();
int other_prio = other_train->get_priority();
if(block->get_turnout_id())
{
- const TrackType::Endpoint &track_ep = track->get_type().get_endpoints()[track.entry()];
+ const TrackType::Endpoint &track_ep = track.endpoint();
bool multiple_paths = (track_ep.paths&(track_ep.paths-1));
- if(multiple_paths || !last->get_turnout_id())
- {
- /* We can keep the blocks reserved so far if we are facing the
- points or if there was no turnout immediately before this one.
- With multiple successive turnouts (as is common in crossovers) it's
- best to hold at one we can divert from. */
- good = last;
- good_sens = nsens;
- good_dist = dist;
- }
-
- // Figure out what path we'd like to take on the turnout
- int path = -1;
- for(list<RouteRef>::iterator i=cur_route; (path<0 && i!=routes.end()); ++i)
- path = i->route->get_turnout(block->get_turnout_id());
- if(path<0)
- path = track->get_active_path();
- if(!(track_ep.paths&(1<<path)))
- {
- for(unsigned i=0; track_ep.paths>>i; ++i)
- if(track_ep.paths&(1<<i))
- path = i;
- }
-
- if(path!=static_cast<int>(track->get_active_path()))
- {
- // The turnout is set to wrong path - switch and wait for it
- pending_block = &*block;
- track->set_active_path(path);
- if(pending_block)
- {
- block->reserve(0);
- break;
- }
- }
-
if(multiple_paths && cur_route!=routes.end() && cur_route->diversion!=block->get_turnout_id())
/* There's multiple paths to be taken and we are on a route - take
note of the diversion possibility */
if(!contested_blocks.empty() && contested_blocks.front()==block)
contested_blocks.pop_front();
- rsv_blocks.push_back(block);
+ blocks.push_back(block);
+
+ if(cur_blocks_end==blocks.end())
+ --cur_blocks_end;
+ if(clear_blocks_end==blocks.end())
+ --clear_blocks_end;
+ if(good_end==blocks.end())
+ --good_end;
+
if(block->get_sensor_id())
++nsens;
if(nsens>0)
}
// Unreserve blocks that were not good
- while(!rsv_blocks.empty() && rsv_blocks.back()!=good)
- {
- rsv_blocks.back()->reserve(0);
- rsv_blocks.pop_back();
- }
+ release_blocks(good_end, blocks.end());
- if(!rsv_blocks.empty() && rsv_blocks.back()!=start)
+ if(blocks.back()!=start)
// We got some new blocks, so no longer need to yield
yielding_to = 0;
+ check_turnout_paths(true);
+
// Make any sensorless blocks at the beginning immediately current
- BlockList::iterator i;
- for(i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !(*i)->get_sensor_id()); ++i) ;
- if(i!=rsv_blocks.begin())
- cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
+ while(cur_blocks_end!=clear_blocks_end && !(*cur_blocks_end)->get_sensor_id())
+ ++cur_blocks_end;
if(try_divert && divert(*divert_track))
- return reserve_more();
+ reserve_more();
+}
+
+void Train::check_turnout_paths(bool set)
+{
+ 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->set_active_path(path);
- return good_sens;
+ /* Check again, in case the driver was able to service the request
+ instantly */
+ if(!set || path!=track->get_active_path())
+ continue;
+ }
+ }
+
+ if(i==clear_blocks_end)
+ ++clear_blocks_end;
+ }
}
float Train::get_reserved_distance_until(const Block *until_block, bool back) const
{
- if(cur_blocks.empty())
+ if(blocks.empty())
return 0;
Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
const VehicleType &vtype = veh.get_type();
TrackIter track(veh.get_track(), veh.get_entry());
- if(!track)
+ if(!track) // XXX Probably unnecessary
return 0;
- BlockList::const_iterator block = cur_blocks.begin();
- while(block!=rsv_blocks.end() && !(*block)->has_track(*track))
- {
+ BlockList::const_iterator block = blocks.begin();
+ while(block!=clear_blocks_end && !(*block)->has_track(*track))
++block;
- if(block==cur_blocks.end())
- {
- if(back)
- return 0;
- block = rsv_blocks.begin();
- }
- }
- if(block==rsv_blocks.end() || &**block==until_block)
+ if(block==clear_blocks_end || &**block==until_block)
return 0;
float result = veh.get_offset();
{
if(back)
{
- if(block==cur_blocks.begin())
+ if(block==blocks.begin())
break;
--block;
}
else
{
++block;
- if(block==cur_blocks.end())
- block = rsv_blocks.begin();
- if(block==rsv_blocks.end())
+ if(block==clear_blocks_end)
break;
}
float Train::get_real_speed(unsigned i) const
{
+ if(i==0)
+ return 0;
if(real_speed[i].weight)
return real_speed[i].speed;
for(low=i; low>0; --low)
if(real_speed[low].weight)
break;
- for(high=i; high<14; ++high)
+ for(high=i; high+1<real_speed.size(); ++high)
if(real_speed[high].weight)
break;
return 0;
}
-unsigned Train::find_speed(float real) const
+unsigned Train::find_speed_step(float real) const
{
- if(real<=real_speed[0].speed)
+ if(real_speed.size()<=1)
+ return 0;
+ if(real<=real_speed[1].speed*0.5)
return 0;
unsigned low = 0;
unsigned high = 0;
unsigned last = 0;
- for(unsigned i=0; (!high && i<=14); ++i)
+ for(unsigned i=0; (!high && i<real_speed.size()); ++i)
if(real_speed[i].weight)
{
last = i;
}
if(!high)
{
+ unsigned limit = real_speed.size()/5;
if(!low)
{
if(real)
- return 3;
+ return limit;
else
return 0;
}
- return min(min(static_cast<unsigned>(low*real/real_speed[low].speed), 14U), last+3);
+ return min(min(static_cast<unsigned>(low*real/real_speed[low].speed), real_speed.size()-1), last+limit);
}
float f = (real-real_speed[low].speed)/(real_speed[high].speed-real_speed[low].speed);
float Train::get_travel_speed() const
{
- float speed = get_real_speed(current_speed);
+ float speed = get_real_speed(current_speed_step);
float scale = layout.get_catalogue().get_scale();
return static_cast<int>(round(speed/scale*3.6/5))*5;
}
signal_status_changed.emit(s);
}
-void Train::release_blocks(BlockList &blocks)
+void Train::release_blocks()
{
- release_blocks(blocks, blocks.begin(), blocks.end());
+ release_blocks(blocks.begin(), blocks.end());
}
-void Train::release_blocks(BlockList &blocks, BlockList::iterator begin, BlockList::iterator end)
+void Train::release_blocks(BlockList::iterator begin, BlockList::iterator end)
{
while(begin!=end)
{
+ 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);
+
+ if(begin==blocks.end())
+ end_of_route = false;
}
}
-void Train::reverse_blocks(BlockList &blocks) const
+void Train::reverse_blocks(BlockList &blks) const
{
- blocks.reverse();
- for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ blks.reverse();
+ for(BlockList::iterator i=blks.begin(); i!=blks.end(); ++i)
*i = i->reverse();
}
}
set<Track *> tracks;
- for(BlockList::iterator i=cur_blocks.begin(); i!=rsv_blocks.end(); )
+ for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
{
const set<Track *> &btracks = (*i)->get_tracks();
for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
if(!target || !target->has_track(**j))
tracks.insert(*j);
-
- if(++i==cur_blocks.end())
- i = rsv_blocks.begin();
}
lead->add_tracks(tracks);
TrackLoopIter track1 = from;
while(diversion.has_track(*track1))
{
- unsigned tid = track1->get_turnout_id();
- unsigned path = (tid ? diversion.get_turnout(tid) : 0);
+ unsigned path = diversion.get_path(*track1);
diversion_len += track1->get_type().get_path_length(path);
track1 = track1.next(path);
TrackLoopIter track2 = from;
while(1)
{
- unsigned tid = track2->get_turnout_id();
- unsigned path = (tid ? route->route->get_turnout(tid) : 0);
+ unsigned path = route->route->get_path(*track2);
route_len += track2->get_type().get_path_length(path);
bool ok = (track2!=from && diversion.has_track(*track2));
void Train::Loader::finish()
{
- if(!obj.cur_blocks.empty())
+ if(!obj.blocks.empty())
{
- TrackIter track = obj.cur_blocks.front().track_iter();
+ TrackIter track = obj.blocks.front().track_iter();
float offset = 2*obj.layout.get_catalogue().get_scale();
obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER);
entry = 0;
blk->reserve(&obj);
- obj.cur_blocks.push_back(BlockIter(blk, entry));
+ obj.blocks.push_back(BlockIter(blk, entry));
if(blk->get_sensor_id())
obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true);
void Train::Loader::real_speed(unsigned i, float speed, float weight)
{
+ if(i>=obj.real_speed.size())
+ return;
obj.real_speed[i].speed = speed;
obj.real_speed[i].weight = weight;
}
projects / r2c2.git / blobdiff