Labelling: Placement shall containt pointer to individual

diff --git a/labeller.c b/labeller.c
index ff4e4a0abd749a65e33ad5a612649e4e68884923..1a88bbc9f69279e5493c043d96876fc8cd892854 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -139,7 +139,7 @@ struct individual **perform_crossover(struct individual *parent1, struct individ
 void perform_mutation(struct individual *individual);
 
 void hide_segment_labels(struct individual *individual);
-void init_placement(struct placement *p, struct request *r);
+void init_placement(struct placement *p, struct individual *individual, struct request *r);
 void init_individual(struct individual *i);
 struct map_part **get_parts(struct placement *symbol, struct individual *individual);
 
@@ -1062,27 +1062,27 @@ void make_population(void)
     int p = 0;
     for (uns j=0; j<GARY_SIZE(requests_point); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_point[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_point[j]);
     }
 
     for (uns j=0; j<GARY_SIZE(requests_line); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j]);
 
       for (uns k=0; k<GARY_SIZE(requests_line[j].sections); k++)
       {
-        init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].sections[k]);
+        init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j].sections[k]);
 
         for (uns l=0; l<GARY_SIZE(requests_line[j].sections[k].segments); l++)
         {
-          init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].sections[k].segments[l]);
+          init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j].sections[k].segments[l]);
         }
       }
     }
 
     for (uns j=0; j<GARY_SIZE(requests_area); j++)
     {
-      init_placement(&(individual->placements[p++]), (struct request *) &requests_area[j]);
+      init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_area[j]);
     }
 
     hide_segment_labels(individual);
@@ -1418,13 +1418,14 @@ void hide_segment_labels(struct individual *individual)
   }
 }
 
-void init_placement(struct placement *p, struct request *r)
+void init_placement(struct placement *p, struct individual *individual, struct request *r)
 {
   // FIXME
   p->request = r;
   p->processed = 0;
   p->x = p->y = 0; // To prevent valgrind from complaining
   p->variant_used = 0;
+  p->individual = individual;
   switch (r->type)
   {
     case REQUEST_POINT: ;

diff --git a/labeller.h b/labeller.h
index c16c43dd11518a40c37b82733c2f08e4d4aa74a9..4e643dfbf67f28ca1e7593b727d467751848a2a9 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -152,6 +152,7 @@ struct placement
   double y;
   int variant_used;
   bool processed;
+  struct individual *individual;
 };
 
 struct map_part