+#include <msp/time/units.h>
+#include <msp/time/utils.h>
#include "control.h"
#include "trafficmanager.h"
#include "train.h"
+using namespace Msp;
+
+#include <iostream>
+using namespace std;
+
namespace Marklin {
Train::Train(TrafficManager &tm, Locomotive &l):
target_speed(0)
{
trfc_mgr.add_train(this);
- trfc_mgr.get_control().signal_sensor_event.connect(sigc::mem_fun(this, &Train::sensor_event));
+
+ const map<unsigned, Sensor *> &sensors=trfc_mgr.get_control().get_sensors();
+ for(map<unsigned, Sensor *>::const_iterator i=sensors.begin(); i!=sensors.end(); ++i)
+ i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Train::sensor_event), i->second));
+}
+
+void Train::set_name(const string &n)
+{
+ name=n;
+
+ signal_name_changed.emit(name);
}
void Train::set_speed(unsigned speed)
{
target_speed=speed;
- if(rsv_blocks.empty() && !reserve_more())
+ if(!target_speed)
+ {
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ i->block->reserve(0);
+ rsv_blocks.clear();
+ }
+ else if(rsv_blocks.empty() && !reserve_more())
return;
loco.set_speed(speed);
}
-void Train::place(Block *block, const Block::Endpoint *entry)
+void Train::place(Block *block, unsigned entry)
{
- for(BlockRefSeq::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();)
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end();)
{
i->block->reserve(0);
i=rsv_blocks.erase(i);
}
- for(BlockRefSeq::iterator i=cur_blocks.begin(); i!=cur_blocks.end();)
+ for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end();)
{
i->block->reserve(0);
i=cur_blocks.erase(i);
bool Train::free_block(Block *block)
{
- for(BlockRefSeq::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block==block)
{
while(i!=rsv_blocks.end())
return false;
}
-void Train::sensor_event(unsigned addr, bool state)
+void Train::tick(const Time::TimeStamp &t)
+{
+ if(try_reserve && t>try_reserve)
+ {
+ if(reserve_more())
+ {
+ loco.set_speed(target_speed);
+ try_reserve=Time::TimeStamp();
+ }
+ else
+ try_reserve=t+2*Time::sec;
+ }
+}
+
+void Train::sensor_event(bool state, Sensor *sensor)
{
+ if(!loco.get_speed())
+ return;
+
+ unsigned addr=sensor->get_address();
+
if(state)
{
- BlockRefSeq::iterator i;
+ list<BlockRef>::iterator i;
for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr)
break;
- cur_blocks.splice(cur_blocks.begin(), rsv_blocks, rsv_blocks.begin(), i);
+ cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
- reserve_more();
- if(rsv_blocks.empty())
+ cout<<"Train "<<this<<" advanced, "<<cur_blocks.size()<<" cur_blocks, "<<rsv_blocks.size()<<" rsv_blocks\n";
+
+ if(rsv_blocks.empty() && !reserve_more())
+ {
loco.set_speed(0);
+ try_reserve=Time::now()+2*Time::sec;
+ }
}
else
{
- BlockRefSeq::iterator i;
+ cout<<"Train "<<this<<" finding blocks to free\n";
+ list<BlockRef>::iterator i;
for(i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
- if(i->block->get_sensor_id()==addr)
- break;
- if(i!=cur_blocks.end())
{
- ++i;
- for(BlockRefSeq::iterator j=cur_blocks.begin(); j!=i; ++j)
- j->block->reserve(0);
- cur_blocks.erase(cur_blocks.begin(), i);
+ if(i->block->get_sensor_id()==addr)
+ {
+ ++i;
+ for(list<BlockRef>::iterator j=cur_blocks.begin(); j!=i; ++j)
+ j->block->reserve(0);
+ cout<<" "<<distance(cur_blocks.begin(),i )<<" blocks freed, ";
+ cur_blocks.erase(cur_blocks.begin(), i);
+ cout<<cur_blocks.size()<<" cur_blocks\n";
+ }
}
reserve_more();
if(!last)
return false;
+ cout<<"Train "<<this<<" reserving more blocks\n";
+
bool result=false;
unsigned size=rsv_blocks.size();
- while(size<5)
+ while(size<2)
{
- const Block::Endpoint *exit=last->block->traverse(last->entry);
- if(exit->link->reserve(this))
+ int exit=last->block->traverse(last->entry);
+ if(exit>=0)
{
- rsv_blocks.push_back(BlockRef(exit->link, exit->link->get_endpoint_by_link(last->block)));
- last=&rsv_blocks.back();
- ++size;
- result=true;
+ Block *link=last->block->get_link(exit);
+ if(link && link->reserve(this))
+ {
+ rsv_blocks.push_back(BlockRef(link, link->get_endpoint_by_link(*last->block)));
+ last=&rsv_blocks.back();
+ ++size;
+ result=true;
+ }
+ else
+ break;
}
else
break;
}
+ cout<<" "<<rsv_blocks.size()<<" rsv_blocks\n";
+
return result;
}