Distributed under the GPL
*/
-#include <iostream>
+#include <algorithm>
#include "control.h"
#include "block.h"
#include "tracktype.h"
namespace Marklin {
-unsigned Block::next_id = 1;
-
Block::Block(TrafficManager &tm, Track &start):
trfc_mgr(tm),
- id(next_id++),
+ id(0),
sensor_id(start.get_sensor_id()),
turnout_id(start.get_turnout_id()),
train(0)
}
}
+ if(sensor_id)
+ id = 0x1000|sensor_id;
+ else if(turnout_id)
+ id = 0x2000|turnout_id;
+
for(unsigned i=0; i<endpoints.size(); ++i)
{
unsigned path = 1<<i;
return -1;
}
-int Block::traverse(unsigned epi, float *len) const
+unsigned Block::traverse(unsigned epi, float *len) const
{
if(epi>=endpoints.size())
throw InvalidParameterValue("Endpoint index out of range");
if(len)
*len += track->get_type().get_path_length(cur_path);
- int other_ep = track->traverse(track_ep, cur_path);
- if(other_ep<0)
- return -1;
-
+ unsigned other_ep = track->traverse(track_ep, cur_path);
for(unsigned i=0; i<endpoints.size(); ++i)
if(endpoints[i].track==track && endpoints[i].track_ep==static_cast<unsigned>(other_ep))
return i;
Track *next = track->get_link(other_ep);
- if(tracks.count(next)==0)
- return -1;
+ if(!tracks.count(next))
+ throw LogicError("Block traversal strayed out of the block");
track_ep = next->get_endpoint_by_link(*track);
track = next;
}
j->link = this;
}
}
+
+ if(!sensor_id && !turnout_id && endpoints.size()==2)
+ {
+ unsigned id1 = endpoints[0].link ? endpoints[0].link->get_id() : 1;
+ unsigned id2 = endpoints[1].link ? endpoints[1].link->get_id() : 1;
+ if(id2<id1)
+ swap(id1, id2);
+ id = (id1<<16)|id2;
+ }
}
Block *Block::get_link(unsigned epi) const
return false;
}
-void Block::print_debug()
-{
- cout<<"Block "<<id;
- if((*tracks.begin())->get_sensor_id())
- cout<<", sensor="<<(*tracks.begin())->get_sensor_id();
- cout<<'\n';
- for(vector<Endpoint>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)
- {
- cout<<" Endpoint, link=";
- if(i->link)
- cout<<i->link->id;
- else
- cout<<"none";
- cout<<", paths="<<i->paths<<'\n';
- }
-}
-
void Block::find_paths(Track &track, unsigned track_ep, unsigned path, set<Track *> &visited)
{
visited.insert(&track);