From: Karryanna <karry@karryanna.cz>
Date: Wed, 13 May 2015 21:46:25 +0000 (+0200)
Subject: Labelling: Placements have indices
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b37ffbcffd89c68c242a371900516550a22c6ff3;p=leo.git

Labelling: Placements have indices
---

diff --git a/labeller.c b/labeller.c
index a3de345..25fd5c8 100644
--- a/labeller.c
+++ b/labeller.c
@@ -103,6 +103,7 @@ int move_min = 0;
 int move_max = 1;
 
 int num_requests = 0;
+int num_placements = 0;
 
 int conf_map_part_width = 5;
 int conf_map_part_height = 5;
@@ -1124,6 +1125,7 @@ void make_population(void)
 {
   for (int i=0; i<conf_pop_size; i++)
   {
+    num_placements = 0; // FIXME: This IS a terrible HACK
     struct individual *i2 = ep_alloc(ep_individuals);
     init_individual(i2);
     population2[i] = i2;
@@ -1719,6 +1721,7 @@ void hide_segment_labels(struct individual *individual)
 void init_placement(struct placement *p, struct individual *individual, struct request *r)
 {
   // FIXME
+  p->ind = num_placements++;
   p->request = r;
   p->processed = 0;
   p->x = p->y = 0; // To prevent valgrind from complaining
diff --git a/labeller.h b/labeller.h
index f4cb2d3..14905bb 100644
--- a/labeller.h
+++ b/labeller.h
@@ -143,6 +143,7 @@ struct placement
   double x;
   double y;
   int variant_used;
+  int ind;
   bool processed;
   // FIXME: Replace with clist?
   struct placement_link *map_links;