Compute deterministic IDs for blocks

[r2c2.git] / source / libmarklin / block.cpp

diff --git a/source/libmarklin/block.cpp b/source/libmarklin/block.cpp
index d4a6878a68b1b6ba475b85fd17014fe490b6cceb..a29469c4fd9b97e32751987e3c42ac6f903b078e 100644 (file)
--- a/source/libmarklin/block.cpp
+++ b/source/libmarklin/block.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <algorithm>
 #include "control.h"
 #include "block.h"
 #include "tracktype.h"
@@ -16,11 +17,9 @@ using namespace Msp;
 
 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)
@@ -49,6 +48,11 @@ Block::Block(TrafficManager &tm, Track &start):
                        }
        }
 
+       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;
@@ -119,6 +123,15 @@ void Block::check_link(Block &other)
                                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