Fix release_blocks so it doesn't cause discrepancies in state
i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second));
i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second));
}
i->second->signal_path_changing.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changing), i->second));
i->second->signal_path_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), i->second));
}
+
+ trfc_mgr.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
}
void Train::set_name(const string &n)
}
void Train::set_name(const string &n)
target_speed = speed;
if(!target_speed)
{
target_speed = speed;
if(!target_speed)
{
trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
trfc_mgr.get_control().set_timer(3*Time::sec).signal_timeout.connect(
- sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Train::release_blocks), sigc::ref(rsv_blocks)), false));
+ sigc::bind_return(sigc::bind(
+ sigc::mem_fun(this, static_cast<void (Train::*)(list<BlockRef> &)>(&Train::release_blocks)),
+ sigc::ref(rsv_blocks)), false));
{
if(nsens<1)
return false;
{
if(nsens<1)
return false;
- for(list<BlockRef>::iterator j=i; j!=rsv_blocks.end(); ++j)
- j->block->reserve(0);
- rsv_blocks.erase(i, rsv_blocks.end());
+ release_blocks(rsv_blocks, i, rsv_blocks.end());
update_speed();
return true;
}
update_speed();
return true;
}
-void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeStamp &, const Time::TimeDelta &dt)
- if(try_reserve && t>try_reserve)
- reserve_more();
-
if(cur_track)
{
unsigned path = 0;
if(cur_track)
{
unsigned path = 0;
void Train::locomotive_reverse_changed(bool)
{
void Train::locomotive_reverse_changed(bool)
{
- for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
- i->block->reserve(0);
- rsv_blocks.clear();
+ release_blocks(rsv_blocks);
reverse_blocks(cur_blocks);
reserve_more();
reverse_blocks(cur_blocks);
reserve_more();
{
// Free blocks up to the last inactive sensor
++end;
{
// Free blocks up to the last inactive sensor
++end;
- for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=end; ++i)
- i->block->reserve(0);
- cur_blocks.erase(cur_blocks.begin(), end);
+ release_blocks(cur_blocks, cur_blocks.begin(), end);
-
- // XXX Should watch for trfc_mgr.signal_block_reserved rather than sensors
- if(target_speed && pending_block && addr==pending_block->get_sensor_id())
- reserve_more();
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_turnout_id()==tid)
{
for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_turnout_id()==tid)
{
- while(i!=rsv_blocks.end())
- {
- i->block->reserve(0);
- i = rsv_blocks.erase(i);
- }
+ release_blocks(rsv_blocks, i, rsv_blocks.end());
reserve_more();
return;
}
reserve_more();
return;
}
+void Train::block_reserved(const Block &block, const Train *train)
+{
+ if(&block==pending_block && !train)
+ reserve_more();
+}
+
unsigned Train::reserve_more()
{
BlockRef *last = 0;
unsigned Train::reserve_more()
{
BlockRef *last = 0;
if(!target_speed)
{
loco.set_speed(0);
if(!target_speed)
{
loco.set_speed(0);
- try_reserve = Time::TimeStamp();
set_status("Stopped");
}
else
set_status("Stopped");
}
else
{
loco.set_speed(0);
pure_speed = false;
{
loco.set_speed(0);
pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
set_status("Blocked");
}
else if(nsens==1 && target_speed>slow_speed)
{
loco.set_speed(slow_speed);
pure_speed = false;
set_status("Blocked");
}
else if(nsens==1 && target_speed>slow_speed)
{
loco.set_speed(slow_speed);
pure_speed = false;
- try_reserve = Time::now()+2*Time::sec;
set_status("Slow");
}
else
{
loco.set_speed(target_speed);
set_status("Slow");
}
else
{
loco.set_speed(target_speed);
- try_reserve = Time::TimeStamp();
set_status(format("Traveling %d kmh", travel_speed));
}
}
set_status(format("Traveling %d kmh", travel_speed));
}
}
void Train::release_blocks(list<BlockRef> &blocks)
{
void Train::release_blocks(list<BlockRef> &blocks)
{
- for(list<BlockRef>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- i->block->reserve(0);
- blocks.clear();
+ release_blocks(blocks, blocks.begin(), blocks.end());
+}
+
+void Train::release_blocks(list<BlockRef> &blocks, list<BlockRef>::iterator begin, list<BlockRef>::iterator end)
+{
+ while(begin!=end)
+ {
+ Block *block = begin->block;
+ blocks.erase(begin++);
+ block->reserve(0);
+ }
}
void Train::reverse_blocks(list<BlockRef> &blocks) const
}
void Train::reverse_blocks(list<BlockRef> &blocks) const
Block *pending_block;
unsigned target_speed;
const Route *route;
Block *pending_block;
unsigned target_speed;
const Route *route;
- Msp::Time::TimeStamp try_reserve;
std::string status;
Msp::Time::TimeStamp last_entry_time;
std::string status;
Msp::Time::TimeStamp last_entry_time;
void sensor_event(bool, Sensor *);
void turnout_path_changing(unsigned, Turnout *);
void turnout_path_changed(unsigned, Turnout *);
void sensor_event(bool, Sensor *);
void turnout_path_changing(unsigned, Turnout *);
void turnout_path_changed(unsigned, Turnout *);
+ void block_reserved(const Block &, const Train *);
unsigned reserve_more();
void update_speed();
float get_real_speed(unsigned) const;
unsigned reserve_more();
void update_speed();
float get_real_speed(unsigned) const;
void set_status(const std::string &);
void set_position(const Block::Endpoint &);
void release_blocks(std::list<BlockRef> &);
void set_status(const std::string &);
void set_position(const Block::Endpoint &);
void release_blocks(std::list<BlockRef> &);
+ void release_blocks(std::list<BlockRef> &, std::list<BlockRef>::iterator, std::list<BlockRef>::iterator);
void reverse_blocks(std::list<BlockRef> &) const;
};
void reverse_blocks(std::list<BlockRef> &) const;
};