X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=labeller.c;h=345b70cee807a813adbd80afcaff491b891291bf;hb=e827ddca25fa9660147cac4d4438d7b41b8e342b;hp=ff4e4a0abd749a65e33ad5a612649e4e68884923;hpb=f45ca61ca4ead2283cb71d7a242596a7d02aa1a0;p=leo.git

diff --git a/labeller.c b/labeller.c
index ff4e4a0..345b70c 100644
--- a/labeller.c
+++ b/labeller.c
@@ -43,6 +43,16 @@ struct individual **population2;
 
 int dbg_segments = 0;
 int dbg_plan = 0;
+int dbg_requests = 0;
+int dbg_graph = 0;
+int dbg_bfs = 0;
+int dbg_map_parts = 0;
+int dbg_movement = 0;
+int dbg_init = 0;
+int dbg_overlaps = 0;
+int dbg_rank = 0;
+int dbg_evolution = 0;
+int dbg_mutation = 0;
 
 int page_width_int;
 int page_height_int;
@@ -65,16 +75,20 @@ int conf_breed_pop_size_perc = 20;
 int conf_breed_perc = 50;			// Percentage of new pop created by breeding
 
 bool conf_mutate_children = 1;
-int conf_mutate_children_prob = 0.3;
+double conf_mutate_children_prob = 0.3;
 
-int conf_mutate_rbest_perc = 60;
-int conf_mutate_pop_size_perc = 20;
+double conf_mutate_rbest = 1;
+double conf_mutate_pop_size = 0.9;
 
-int conf_mutate_move_bound = 0.2;
-int conf_mutate_regen_bound = 0.1;
-int conf_mutate_chvar_bound = 0.1;
+double conf_mutate_move_bound = 1.0;
+double conf_mutate_regen_bound = 0.0;
+double conf_mutate_chvar_bound = 0.0;
 
-int conf_elite_perc = 5;
+int mutate_pop_size;
+int mutate_rbest_size;
+
+double conf_elite_pop_size = 0.1;
+int elite_pop_size;
 
 double conf_max_section_length = 100;
 double conf_max_section_overlay = 10;
@@ -86,9 +100,16 @@ int pop2_ind;
 int conf_part_size = 50;
 
 int move_min = 0;
-int move_max = 1;
+int move_max = 5;
 
 int num_requests = 0;
+int num_placements = 0;
+
+int conf_map_part_width = 5;
+int conf_map_part_height = 5;
+int num_map_parts_row;
+int num_map_parts_col;
+int num_map_parts;
 
 void make_graph(void);
 void label_graph(void);
@@ -96,6 +117,10 @@ void join_edge(struct graph_edge *e, int dir);
 void bfs(uns longline);
 void make_segments(void);
 
+int overlaps(struct placement *p1, struct placement *p2);
+int get_overlap(struct placement *p);
+int individual_overlap(struct individual *individual);
+
 void make_population(void);
 bool shall_terminate(void);
 void breed(void);
@@ -104,10 +129,12 @@ void elite(void);
 void rank_population(void);
 void plan_individual(struct individual *individual);
 
-void make_bitmap(struct point_variant *v, struct symbol *sym);
-void make_bitmap_icon(struct point_variant *v, struct sym_icon *si);
-void make_bitmap_point(struct point_variant *v, struct sym_point *sp);
-void make_bitmap_label(struct point_variant *v, struct sym_text *text);
+int cmp_individual(const void *a, const void *b);
+
+void make_bitmap(struct variant *v, struct symbol *sym);
+void make_bitmap_icon(struct variant *v, struct sym_icon *si);
+void make_bitmap_point(struct variant *v, struct sym_point *sp);
+void make_bitmap_label(struct variant *v, struct sym_text *text);
 
 void cut_edge(struct graph_edge *e, double dist);
 struct request_line *make_new_line(void);
@@ -124,13 +151,18 @@ void dump_longlines(void);
 void dump_linelabel_requests(void);
 void dump_individual(struct individual *individual);
 void print_label(struct symbol *sym);
+void dump_penalties(struct individual **population);
 
 double gen_movement(void);
+double gen_movement_uniform(void);
 void gen_coords(struct placement *p);
 void gen_coords_point(struct placement *p);
 void gen_coords_segment(struct placement *p);
 void gen_coords_area(struct placement *p);
 
+struct map_part **get_map_parts(struct placement *p);
+void update_map_parts(struct placement *p);
+
 void make_segments_old(void);
 
 void labeller_cleanup(void);
@@ -139,7 +171,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);
 
@@ -149,6 +181,7 @@ struct placement **get_closure(struct placement *placement, struct individual *p
 void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child);
 void move_symbol(struct placement *p);
 void move_symbol_point(struct placement *p);
+void move_symbol_segment(struct placement *p);
 
 struct placement **get_overlapping(struct placement *p);
 void filter(struct placement **list, bool *pred);
@@ -165,6 +198,8 @@ int min2(int a, int b);
 int max4(int a, int b, int c, int d);
 int min4(int a, int b, int c, int d);
 
+struct placement dummy_placement;
+
 int max2(int a, int b)
 {
   return (a > b ? a : b);
@@ -209,10 +244,16 @@ void labeller_init(void)
 
   page_width_int = floor(page_width);
   page_height_int = floor(page_height);
+
+  num_map_parts_row = (page_width_int + conf_map_part_width) / conf_map_part_width;
+  num_map_parts_col = (page_height_int + conf_map_part_height) / conf_map_part_height;
+  num_map_parts = num_map_parts_row * num_map_parts_col;
 }
 
-void make_bitmap(struct point_variant *v, struct symbol *sym)
+void make_bitmap(struct variant *v, struct symbol *sym)
 {
+  v->offset_x = v->offset_y = 0;
+
   switch (sym->type)
   {
     case SYMBOLIZER_POINT:
@@ -229,52 +270,38 @@ void make_bitmap(struct point_variant *v, struct symbol *sym)
   }
 }
 
-void make_bitmap_icon(struct point_variant *v, struct sym_icon *si)
+void make_bitmap_icon(struct variant *v, struct sym_icon *si)
 {
-  v->width = si->sir.icon->width;
-  v->height = si->sir.icon->height;
-  v->bitmap = malloc((int) ceil(v->width * v->height * sizeof(bool)));
+  v->width = si->sir.width + 1;
+  v->height = si->sir.height + 1;
+  v->bitmap = malloc(v->width * v->height * sizeof(bool));
   for (int i=0; i<v->width*v->height; i++) v->bitmap[i] = 1;
 }
 
-void make_bitmap_point(struct point_variant *v, struct sym_point *sp)
+void make_bitmap_point(struct variant *v, struct sym_point *sp)
 {
-  v->width = v->height = sp->size;
-  v->bitmap = malloc(sp->size*sp->size * sizeof(bool));
+  v->width = v->height = sp->size + 1;
+  v->bitmap = malloc(v->width * v->height * sizeof(bool));
   // FIXME: Okay, memset would be much nicer here
   for (int i=0; i<sp->size*sp->size; i++) v->bitmap[i] = 1;
 }
 
-void make_bitmap_label(struct point_variant *v, struct sym_text *text)
+void make_bitmap_label(struct variant *v, struct sym_text *text)
 {
-  int x_ld = 0;
-  int y_ld = 0;
-  int x_lu = 0;
-  int y_lu = 0;
-  int x_rd = 0;
-  int y_rd = 0;
-  int x_ru = 0;
-  int y_ru = 0;
-
-  v->width = max4(x_ld, x_lu, x_rd, x_ru) - min4(x_ld, x_lu, x_rd, x_ru);
-  v->height = max4(y_ld, y_lu, y_rd, y_ru) - min4(y_ld, y_lu, y_rd, y_ru);
-  //v->bitmap = malloc((int) (ceil(v->width) * ceil(v->height) * sizeof(bool)));
-
   v->width = ceil(text->tw);
   v->height = ceil(text->th);
   v->bitmap = malloc(v->width * v->height * sizeof(bool));
-//  printf("Allocated bitmap of %d bools for %d x %d label\n", v->width * v->height, v->width, v->height);
   for (int i=0; i<v->height; i++)
     for (int j=0; j<v->width; j++)
     {
       v->bitmap[i*v->width + j] = 1;
-//      printf("Writing at %d\n", i*v->width + j);
     }
 }
 
 void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex)
 {
-printf("Adding point\n");
+  if (dbg_requests)
+    printf("Adding point\n");
   if (object->type != OSM_TYPE_NODE)
   {
     printf("Warning: Point label requested on non-point object\n");
@@ -293,27 +320,21 @@ printf("Adding point\n");
   r->offset_y = 0;
 
   r->num_variants = 1;
-  GARY_INIT(r->variants, 0);
+  GARY_INIT(r->request.variants, 0);
 
-  struct point_variant *v = GARY_PUSH(r->variants);
+  struct variant *v = GARY_PUSH(r->request.variants);
 
   struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
   r->x = n->x;
   r->y = n->y;
+  make_bitmap(v, sym);
   switch (sym->type)
   {
     case SYMBOLIZER_ICON:
-      make_bitmap_icon(v, (struct sym_icon *) sym);
+      // FIXME: Really?
       r->x = ((struct sym_icon *)sym)->sir.x;
       r->y = ((struct sym_icon *)sym)->sir.y;
       break;
-    case SYMBOLIZER_POINT:
-      make_bitmap_point(v, (struct sym_point *) sym);
-      break;
-    case SYMBOLIZER_TEXT: ;
-      struct sym_text *st = (struct sym_text *) sym;
-      struct osm_node *n = (struct osm_node *) object;
-      make_bitmap_label(v, st);
     default:
       // FIXME
       return;
@@ -324,7 +345,8 @@ printf("Adding point\n");
 
 void labeller_add_line(struct symbol *sym, z_index_t zindex)
 {
-printf("Adding line on %u\n", zindex);
+  if (dbg_requests)
+    printf("Adding line on %u\n", zindex);
   struct buffer_line *b = GARY_PUSH(buffer_line);
   b->line = (struct sym_line *) sym;
   b->zindex = zindex;
@@ -339,7 +361,8 @@ void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t
     return;
   }
 
-  printf("[LAB] Labelling way %ju on %u\n", o->id, zindex);
+  if (dbg_requests)
+    printf("[LAB] Labelling way %ju on %u\n", o->id, zindex);
   struct buffer_linelabel *ll = GARY_PUSH(buffer_linelabel);
   ll->way = (struct osm_way *) o;
   ll->label = sym;
@@ -348,7 +371,8 @@ void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t
 
 void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
 {
-printf("Adding area on %u\n", zindex);
+  if (dbg_requests)
+    printf("Adding area on %u\n", zindex);
   struct request_area *r = GARY_PUSH(requests_area);
 
   r->request.type = REQUEST_AREA;
@@ -360,21 +384,9 @@ printf("Adding area on %u\n", zindex);
 
   osm_obj_center(o, &(r->cx), &(r->cy));
 
-  GARY_INIT(r->variants, 0);
-  struct point_variant *v = GARY_PUSH(r->variants);
-  switch (sym->type)
-  {
-    case SYMBOLIZER_ICON:
-      printf("DEBUG: Icon label\n");
-      make_bitmap_icon(v, (struct sym_icon *) sym);
-      break;
-    case SYMBOLIZER_TEXT:
-      printf("DEBUG: Text label\n");
-      make_bitmap_label(v, (struct sym_text *) sym);
-    default:
-      // FIXME
-      ;
-  }
+  GARY_INIT(r->request.variants, 0);
+  struct variant *v = GARY_PUSH(r->request.variants);
+  make_bitmap(v, sym);
 }
 
 void make_graph(void)
@@ -468,14 +480,17 @@ void dump_graph(void)
 
 void label_graph(void)
 {
-printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
+  if (dbg_graph)
+    printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
   for (uns i=0; i<GARY_SIZE(buffer_linelabel); i++)
   {
     if (buffer_linelabel[i].label->type == SYMBOLIZER_TEXT)
-    printf("Labelling nodes of way %s\n", osm_val_decode(((struct sym_text *) buffer_linelabel[i].label)->text));
+    if (dbg_graph)
+      printf("Labelling nodes of way %s\n", osm_val_decode(((struct sym_text *) buffer_linelabel[i].label)->text));
     CLIST_FOR_EACH(struct osm_ref *, ref, buffer_linelabel[i].way->nodes)
     {
-      printf("Looking for node %ju\n", ref->o->id);
+      if (dbg_graph)
+        printf("Looking for node %ju\n", ref->o->id);
       struct graph_node *n = hash_find(ref->o->id);
       if (n == NULL)
       {
@@ -483,12 +498,14 @@ printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
       }
       else
       {
-        printf("Searching among %u edges\n", GARY_SIZE(n->edges));
+        if (dbg_graph)
+          printf("Searching among %u edges\n", GARY_SIZE(n->edges));
         for (uns j=0; j<GARY_SIZE(n->edges); j++)
         {
           if (n->edges[j]->id == buffer_linelabel[i].way->o.id)
           {
-            printf("Labelling node %ju\n", n->id);
+            if (dbg_graph)
+              printf("Labelling node %ju\n", n->id);
             n->edges[j]->label = buffer_linelabel[i].label;
             n->edges[j]->zindex = buffer_linelabel[i].zindex;
           }
@@ -500,19 +517,18 @@ printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
 
 void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir)
 {
-printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir);
+  if (dbg_bfs)
+    printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir);
   struct graph_edge *candidate = NULL;
 
   for (uns i=0; i<GARY_SIZE(node->edges); i++)
   {
     struct graph_edge *other = node->edges[i];
-if (e->num == 987) printf("Got label %d\n", e->num);
     if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue;
-if (e->num == 987) printf("Continuing with edge %d\n", e->num);
 
-printf("Testing %d ?= %d\n", other->visited, e->longline);
     if ((uns) other->visited != e->longline) {
-    printf("Pushing new edge %d / %ju\n", other->num, other->id);
+    if (dbg_bfs)
+      printf("Pushing new edge %d / %ju\n", other->num, other->id);
     struct graph_edge **e_ptr = GARY_PUSH(bfs_queue);
     *e_ptr = other;
     other->visited = e->longline;
@@ -534,7 +550,8 @@ printf("Testing %d ?= %d\n", other->visited, e->longline);
 
   if (candidate)
   {
-printf("New line in longline %u\n", e->longline);
+    if (dbg_bfs)
+      printf("New line in longline %u\n", e->longline);
     struct graph_edge *other = candidate;
       other->longline = e->longline;
       other->dir = dir;
@@ -566,12 +583,15 @@ printf("New line in longline %u\n", e->longline);
 
 void bfs(uns longline)
 {
-printf("BFS called for longline %u\n", longline);
-printf("%d longlines are believed to exist, %d exist\n", num_longlines, GARY_SIZE(longlines));
+if (dbg_bfs)
+  printf("BFS called for longline %u\n", longline);
+if (dbg_bfs)
+  printf("%d longlines are believed to exist, %d exist\n", num_longlines, GARY_SIZE(longlines));
   for (uns i=0; i<GARY_SIZE(bfs_queue); i++)
   {
     struct graph_edge *cur = bfs_queue[i];
-    printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue));
+    if (dbg_bfs)
+      printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue));
     //ASSERT(! cur->visited);
 
     cur->visited = longline;
@@ -616,16 +636,20 @@ void bfs_wrapper(void)
       {
         GARY_PUSH(longlines);
         longlines[num_longlines].first = node->edges[i];
-        printf("Running new BFS\n");
-        printf("Creating longline %u\n", num_longlines);
+        if (dbg_bfs)
+          printf("Running new BFS\n");
+        if (dbg_bfs)
+          printf("Creating longline %u\n", num_longlines);
         GARY_RESIZE(bfs_queue, 0);
         struct graph_edge **e = GARY_PUSH(bfs_queue);
         *e = node->edges[i];
         node->edges[i]->longline = num_longlines;
         bfs(node->edges[i]->longline);
         //dump_longlines();
-        printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0;
-        printf("Planned %u edges\n", GARY_SIZE(bfs_queue));
+        if (dbg_bfs)
+          printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0;
+        if (dbg_bfs)
+          printf("Planned %u edges\n", GARY_SIZE(bfs_queue));
         num_longlines++;
       }
     }
@@ -662,6 +686,7 @@ struct request_line *make_new_line(void)
   rl->request.ind = num_requests++;
   rl->request.type = REQUEST_LINE;
   GARY_INIT(rl->sections, 0);
+  GARY_INIT(rl->request.variants, 0);
 
   return rl;
 }
@@ -673,6 +698,7 @@ struct request_section *make_new_section(struct request_line *rl)
   rls->request.type = REQUEST_SECTION;
   rls->num_segments = 0;
   GARY_INIT(rls->segments, 0);
+  GARY_INIT(rls->request.variants, 0);
 
   return rls;
 }
@@ -685,9 +711,9 @@ struct request_segment *make_new_segment(struct request_section *rls, struct sym
   rs->request.ind = num_requests++;
   rs->request.type = REQUEST_SEGMENT;
 
-  struct point_variant *v = malloc(sizeof(struct point_variant));
+  GARY_INIT(rs->request.variants, 0);
+  struct variant *v = GARY_PUSH(rs->request.variants);
   make_bitmap(v, sym);
-  rs->variant = v;
 
   return rs;
 }
@@ -701,6 +727,8 @@ void cut_edge(struct graph_edge *e, double dist)
   *new = *e;
   e->next = new;
 
+  // FIXME? Create new label for new edge, don't only copy pointer?
+
   struct osm_node *n1 = e->n1->o;
   struct osm_node *n2 = e->n2->o;
 
@@ -723,6 +751,7 @@ void cut_edge(struct graph_edge *e, double dist)
 
   e->length = hypot(abs(n1->x - n11->x), abs(n1->y - n11->y));
   new->length = hypot(abs(n11->x - n2->x), abs(n11->y - n2->y));
+  new->visited = 0;
 }
 
 void make_segments(void)
@@ -747,48 +776,41 @@ void make_segments(void)
     }
     else
     {
-      printf("Warning: Skipping line\n");
+      if (dbg_segments)
+        printf("Warning: Skipping line\n");
       continue;
       // FIXME;
     }
 
-    printf("New longline\n");
+    if (dbg_segments)
+      printf("New longline\n");
     while (e)
     {
-      if (cur_length + e->length > conf_max_section_length + conf_max_section_overlay)
+      if (e->visited < 0)
       {
-        if (dbg_segments)
-          printf("Edge too long, length is %.2f; %.2f - %.2f = %.2f\n", e->length, conf_max_section_length, cur_length, conf_max_section_length - cur_length);
-        cut_edge(e, conf_max_section_length - cur_length);
+        printf("BEWARE: Edge cycle\n");
+        break;
       }
+      e->visited = -1; // FIXME
 
-      if (cur_length + e->length > conf_max_section_length)
-      {
-        if (dbg_segments)
-          printf("Making new section, new length would be %f, allowed is %.2f / %.2f\n", cur_length + e->length, conf_max_section_length, conf_max_section_overlay);
-
-        struct osm_node *n1 = e->n1->o;
-        struct osm_node *n2 = e->n2->o;
-        rs = make_new_segment(rls, e->label);
-        rs->x1 = n1->x;
-        rs->y1 = n1->y;
-        rs->x2 = n2->x;
-        rs->y2 = n2->y;
-        rs->zindex = e->zindex;
-
-        rs->label = malloc(sizeof(struct sym_text));
-        *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
-        rls = make_new_section(request);
-        cur_length = 0;
-      }
+      if (dbg_segments)
+        printf("Taking edge from [%.2f; %.2f] to [%.2f; %.2f] of length %.2f\n", e->n1->o->x, e->n1->o->y, e->n2->o->x, e->n2->o->y, e->length);
 
       if (st && (e->length < st->tw))
       {
         e = e->next;
-        printf("Warning: Skipping segment\n");
+        //printf("Warning: Skipping segment\n");
         continue;
       }
 
+      if (cur_length + e->length > conf_max_section_length + conf_max_section_overlay)
+      {
+        if (dbg_segments)
+          printf("Edge too long, length is %.2f; %.2f - %.2f = %.2f\n", e->length, conf_max_section_length, cur_length, conf_max_section_length - cur_length);
+        // HACK to prevent cutting to 0 lenght
+        cut_edge(e, max2(conf_max_section_length - cur_length, 2));
+      }
+
       rs = make_new_segment(rls, e->label);
       rs->label = malloc(sizeof(struct sym_text));
       *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
@@ -798,11 +820,19 @@ void make_segments(void)
       rs->x2 = e->n2->o->x;
       rs->y2 = e->n2->o->y;
 
-      // FIXME: Set text rotation
-      rs->angle = atan2(rs->x2 - rs->x1, rs->y2 - rs->y1);
+      rs->slope = (rs->y2 - rs->y1) / (rs->x2 - rs->x1);
       rs->zindex = e->zindex;
 
       cur_length += e->length;
+      if (cur_length > conf_max_section_length)
+      {
+        if (dbg_segments)
+          printf("Making new section, new length would be %f, allowed is %.2f / %.2f\n", cur_length + e->length, conf_max_section_length, conf_max_section_overlay);
+
+        rls = make_new_section(request);
+        cur_length = 0;
+      }
+
       e = e->next;
     }
 
@@ -850,39 +880,27 @@ void dump_bitmaps(struct individual *individual)
 
   for (uns i=0; i<GARY_SIZE(individual->placements); i++)
   {
-fprintf(stderr, "%d-th placement\n", i);
+    if (individual->placements[i].variant_used == -1) continue;
+
     struct placement *p = &(individual->placements[i]);
-    struct point_variant *v = NULL;
+    struct variant *v = NULL;
 
     switch (p->request->type)
     {
       case REQUEST_SEGMENT: ;
-        struct request_segment *rs = (struct request_segment *) p->request;
-        v = rs->variant;
-        break;
       case REQUEST_POINT: ;
-        struct request_point *rp = (struct request_point *) p->request;
-        v = &(rp->variants[p->variant_used]);
-        break;
       case REQUEST_AREA: ;
-        struct request_area *ra = (struct request_area *) p->request;
-        printf("Using %d-th of %d variants\n", p->variant_used, GARY_SIZE(ra->variants));
-        v = &(ra->variants[p->variant_used]);
+        v = &(p->request->variants[p->variant_used]);
         break;
       default:
-        printf("Testing request type (dump_bitmaps): %d\n", p->request->type);
         ASSERT(p->request->type != REQUEST_INVALID);
         continue;
     }
 
-    printf("Got after with %d-th placement of request type %d\n", i, p->request->type);
-
-    printf("Rendering %d-th label %d x %d (w x h)\n", i, v->width, v->height);
     for (int row = max2(p->y, 0); row < min2(p->y + v->height, page_height_int); row++)
     {
       for (int col = max2(p->x, 0); col < min2(p->x + v->width, page_width_int); col++)
       {
-        printf("Writing to %d\n", row*page_width_int + col);
         bitmap[row * page_width_int + col] = 1;
       }
     }
@@ -1004,41 +1022,75 @@ if (dbg_plan)
         ASSERT(s->type != SYMBOLIZER_INVALID);
     }
   }
+}
 
+void dump_penalties(struct individual **population)
+{
+  for (int i=0; i<conf_pop_size; i++)
+  {
+    printf("Individual %d has penalty %d\n", i, population[i]->penalty);
+  }
 }
 
 void labeller_label(void)
 {
   make_graph();
   label_graph();
-//dump_graph();
   bfs_wrapper();
-//dump_longlines();
   make_segments();
-dump_linelabel_requests();
 
 printf("Having %u point requests, %u line requests and %u area requests\n", GARY_SIZE(requests_point), GARY_SIZE(requests_line), GARY_SIZE(requests_area));
 
   GARY_INIT(population1, conf_pop_size);
   GARY_INIT(population2, conf_pop_size);
   make_population();
+  rank_population();
+  qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
+
+  if (dbg_evolution)
+    dump_penalties(population1);
 
   printf("Dealing with %d requests\n", num_requests);
 
-/*
+  mutate_pop_size = conf_mutate_pop_size * conf_pop_size;
+  mutate_rbest_size = conf_mutate_rbest * conf_pop_size;
+  if (dbg_evolution)
+  {
+    printf("Mutation parameters:\n");
+    printf(" %d individuals are created\n", mutate_pop_size);
+    printf(" %d best individuals in old population are considered\n", mutate_rbest_size);
+  }
+
+  elite_pop_size = conf_elite_pop_size * conf_pop_size;
+  if (dbg_evolution)
+  {
+    printf("Elitism parameters:\n");
+    printf(" %d best individuals are copied\n", elite_pop_size);
+  }
+
   while (! shall_terminate())
   {
     iteration++;
+    if (dbg_evolution)
+      printf("*** Iteration %d ***\n", iteration);
+
+    mutate();
+    elite();
 
     struct individual **swp = population1;
     population1 = population2;
     population2 = swp;
     pop2_ind = 0;
-  }
-*/
 
-  dump_individual(population1[0]);
-//dump_bitmaps(population1[0]);
+    if (dbg_evolution)
+      dump_penalties(population1);
+
+    rank_population();
+    qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
+
+    if (dbg_evolution)
+      dump_penalties(population1);
+  }
 
   plan_individual(population1[0]);
 
@@ -1055,45 +1107,44 @@ void make_population(void)
 {
   for (int i=0; i<conf_pop_size; i++)
   {
-    printf("Making individual %d\n", i);
+    num_placements = 0; // FIXME: This IS a terrible HACK
+    struct individual *i2 = ep_alloc(ep_individuals);
+    init_individual(i2);
+    population2[i] = i2;
+
+    if (dbg_init)
+      printf("Making individual %d\n", i);
     struct individual *individual = ep_alloc(ep_individuals); init_individual(individual);
     population1[i] = individual;
 
     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);
 
-if (p != num_requests)
-{
-  printf("Say bye\n");
-  exit(42);
-}
-
-printf("Testing p\n");
     ASSERT(p == num_requests);
   }
 }
@@ -1195,12 +1246,16 @@ struct individual **perform_crossover(struct individual *parent1, struct individ
 
 void mutate(void)
 {
-  int i = 0;
-  int conf_mutate_pop_size = conf_mutate_pop_size_perc * conf_pop_size;
-  while (i < conf_mutate_rbest_perc * conf_pop_size)
+  for (int i=0; i < mutate_pop_size; i++)
   {
-    int ind = randint(1, conf_mutate_pop_size);
-    copy_individual(population2[pop2_ind], population1[ind]);
+    if (dbg_mutation)
+      printf("%d\n", i);
+    int ind = randint(1, mutate_rbest_size);
+    if (dbg_mutation)
+      printf("Mutating %d-th individual of original population\n", ind);
+    copy_individual(population1[ind], population2[pop2_ind]);
+    if (dbg_mutation)
+      printf("Individual %d in pop2 inited from individual %d in pop1\n", pop2_ind, ind);
     perform_mutation(population2[pop2_ind]);
     pop2_ind++;
   }
@@ -1210,11 +1265,13 @@ void perform_mutation(struct individual *individual)
 {
   for (uns i=0; i<GARY_SIZE(individual->placements); i++)
   {
-    int x = randint(1, 1000);
-    int acc = 0;
+    double x = randdouble();
+    double acc = 0;
 
     if (x <= acc + conf_mutate_move_bound)
     {
+      if (dbg_mutation)
+        printf("Mutation: Moving symbol in placement %u\n", i);
       move_symbol(&(individual->placements[i]));
       continue;
     }
@@ -1229,9 +1286,20 @@ void perform_mutation(struct individual *individual)
 
     if (x <= acc + conf_mutate_chvar_bound)
     {
-      if (0) // if num_variants > 1
+      struct placement *p = &(individual->placements[i]);
+      switch (p->request->type)
       {
-        // FIXME: assign new variant
+        case REQUEST_POINT:
+        case REQUEST_SEGMENT:
+        case REQUEST_AREA:
+          // Does nothing when there are 0 variants... does it mind?
+          p->variant_used = randint(0, GARY_SIZE(p->request->variants) - 1);
+          break;
+        case REQUEST_SECTION:
+          p->variant_used = randint(0, GARY_SIZE(((struct request_section *) p->request)->segments)-1);
+          break;
+        default:
+          ;
       }
     }
   }
@@ -1239,15 +1307,209 @@ void perform_mutation(struct individual *individual)
 
 void elite(void)
 {
-  for (int i=0; i<conf_elite_perc * conf_pop_size; i++)
+  for (int i=0; i<elite_pop_size; i++)
   {
-    population2[pop2_ind++] = population1[0];
+    copy_individual(population1[i], population2[pop2_ind++]);
   }
 }
 
+int overlaps(struct placement *p1, struct placement *p2)
+{
+  if (p1->request->type != REQUEST_POINT &&
+      p1->request->type != REQUEST_SEGMENT &&
+      p1->request->type != REQUEST_AREA)
+    return 0;
+
+  if (p2->request->type != REQUEST_POINT &&
+      p2->request->type != REQUEST_SEGMENT &&
+      p2->request->type != REQUEST_AREA)
+    return 0;
+
+  if (p1->variant_used == -1 || p2->variant_used == -1)
+    return 0;
+
+  struct variant *v1, *v2;
+
+  v1 = &(p1->request->variants[p1->variant_used]);
+  v2 = &(p2->request->variants[p2->variant_used]);
+
+  int p1x = p1->x; int p1y = p1->y;
+  int p2x = p2->x; int p2y = p2->y;
+
+  int overlap = 0;
+  for (int y=max2(0, max2(p1y, p2y)); y<min2(page_height_int, min2(p1y+v1->height, p2y+v2->height)); y++)
+    for (int x=max2(0, max2(p1x, p2x)); x<min2(page_width_int, min2(p1x+v1->width, p2x+v2->width)); x++)
+    {
+      if (v1->bitmap[(y-p1y)*v1->width + (x-p1x)] &&
+          v2->bitmap[(y-p2y)*v2->width + (x-p2x)])
+        overlap++;
+    }
+
+  return overlap;
+}
+
+int get_overlap(struct placement *p)
+{
+  struct map_part **parts = get_map_parts(p);
+  if (! parts)
+  {
+    if (dbg_overlaps)
+      printf("Placement of request %d seems not to be placed\n", p->request->ind);
+    return 0;
+  }
+
+  struct placement **others;
+  bool *planned;
+
+  GARY_INIT_ZERO(planned, num_requests);
+  planned[p->request->ind] = 1;
+  GARY_INIT(others, 0);
+
+  for (uns i=0; i<GARY_SIZE(parts); i++)
+  {
+    struct map_placement *mp = parts[i]->placement->next;
+    while (mp)
+    {
+      if (! planned[mp->placement->request->ind])
+      {
+        struct placement **p = GARY_PUSH(others);
+        *p = mp->placement;
+        planned[mp->placement->request->ind] = true;
+      }
+      mp = mp->next;
+    }
+  }
+
+  int overlap = 0;
+  for (uns i=0; i<GARY_SIZE(others); i++)
+  {
+    overlap += overlaps(p, others[i]);
+  }
+
+  GARY_FREE(planned);
+  GARY_FREE(parts);
+  GARY_FREE(others);
+
+  return overlap;
+}
+
+int individual_overlap(struct individual *individual)
+{
+  int overlap = 0;
+
+  for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+  {
+    overlap += get_overlap(&individual->placements[i]);
+  }
+
+  return overlap;
+}
+
+int cmp_individual(const void *a, const void *b)
+{
+  struct individual **ia = (struct individual **) a;
+  struct individual **ib = (struct individual **) b;
+
+  return (*ia)->penalty - (*ib)->penalty;
+}
+
 void rank_population(void)
 {
-  // FIXME
+  int penalty;
+
+  for (int i=0; i<conf_pop_size; i++)
+  {
+    if (dbg_rank)
+      printf("Individual %d\n", i);
+    population1[i]->penalty = 0;
+
+    penalty = individual_overlap(population1[i]);
+    if (dbg_rank)
+      printf("Increasing penalty by %d for overlap\n", penalty);
+    population1[i]->penalty += penalty;
+  }
+}
+
+struct map_part **get_map_parts(struct placement *p)
+{
+  if (p->variant_used < 0) return NULL;
+
+  struct map_part **buffer;
+  GARY_INIT(buffer, 0);
+
+  if (dbg_map_parts)
+    printf("Looking for map parts containing placement of request %d, placed at [%.2f; %.2f]\n", p->request->ind, p->x, p->y);
+
+  struct variant v;
+  switch (p->request->type)
+  {
+    case REQUEST_POINT:
+    case REQUEST_SEGMENT:
+    case REQUEST_AREA:
+      v = p->request->variants[p->variant_used];
+      break;
+    default:
+      return NULL;
+  }
+
+  int x_min = max2(0, p->x) / conf_map_part_width;
+  int x_max = min2(page_width_int, (p->x + v.width + conf_map_part_width - 1)) / conf_map_part_width;
+  int y_min = max2(0, p->y) / conf_map_part_height;
+  int y_max = min2(page_height_int, (p->y + v.height + conf_map_part_height - 1)) / conf_map_part_height;
+
+  if (dbg_map_parts)
+    printf("Cells between [%d; %d] and [%d; %d] generated\n", x_min, y_min, x_max, y_max);
+
+  for (int y=y_min; y<=y_max; y++)
+    for (int x=x_min; x<=x_max; x++)
+    {
+      struct map_part **m = GARY_PUSH(buffer);
+      if (dbg_map_parts)
+        printf("Asking for %d of %u\n", y * num_map_parts_row + x, GARY_SIZE(p->individual->map));
+      *m = p->individual->map[y * num_map_parts_row + x];
+    }
+
+  return buffer;
+}
+
+void update_map_parts(struct placement *p)
+{
+  struct placement_link *ml = p->map_links;
+  while (ml)
+  {
+    struct map_placement *mp = ml->mp;
+
+    mp->prev->next = mp->next;
+    if (mp->next)
+      mp->next->prev = mp->prev;
+    free(mp);
+
+    struct placement_link *tmp = ml;
+    ml = ml->next;
+    free(tmp);
+  }
+  p->map_links = NULL;
+
+  struct map_part **parts = get_map_parts(p);
+  if (parts == NULL) return;
+
+  for (uns i=0; i<GARY_SIZE(parts); i++)
+  {
+    struct map_placement *mp = malloc(sizeof(struct map_placement));
+    mp->placement = p;
+
+    mp->next = parts[i]->placement->next;
+    mp->prev = parts[i]->placement;
+    parts[i]->placement->next = mp;
+    if (mp->next) mp->next->prev = mp;
+
+    struct placement_link *ml = malloc(sizeof(struct placement_link));
+    ml->mp = mp;
+    ml->next = p->map_links;
+    p->map_links = ml;
+  }
+
+  GARY_FREE(parts);
 }
 
 void gen_coords(struct placement *p)
@@ -1264,22 +1526,32 @@ void gen_coords(struct placement *p)
       gen_coords_segment(p);
       break;
     case REQUEST_LINE:
-      printf("Not yet implemented\n");
+      if (dbg_movement)
+        printf("Not yet implemented\n");
       break;
     default:
-      printf("Testing request type\n");
+      if (dbg_movement)
+        printf("Testing request type\n");
       ASSERT(p->request->type != REQUEST_INVALID);
   }
+
+  update_map_parts(p);
 }
 
 double gen_movement(void)
 {
-  double m = (random() % 1000000) / 10000;
+  double m = (random() % 100000) / 10000;
   m = pow(m, 1.0/3) * flip(1, -1);
-  printf("Movement %.2f\n", m);
+  if (dbg_movement)
+    printf("Movement %.2f\n", m);
   return m;
 }
 
+double gen_movement_uniform(void)
+{
+  return (move_max - move_min) * randdouble() * flip(1, -1);
+}
+
 void gen_coords_point(struct placement *p)
 {
   p->x = p->x + gen_movement();
@@ -1300,7 +1572,8 @@ void gen_coords_area(struct placement *p)
   p->x = p->x + gen_movement();
   p->y = p->y + gen_movement();
 
-  printf("Moved label to [%.2f; %.2f] from [%.2f; %.2f]\n", p->x, p->y, ra->cx, ra->cy);
+  if (dbg_movement)
+    printf("Moved label to [%.2f; %.2f] from [%.2f; %.2f]\n", p->x, p->y, ra->cx, ra->cy);
 }
 
 struct map_part **get_parts(struct placement *symbol, struct individual *individual)
@@ -1376,11 +1649,12 @@ void move_symbol(struct placement *p)
   switch (p->request->type)
   {
     case REQUEST_POINT:
+    case REQUEST_AREA:
       move_symbol_point(p);
-    case REQUEST_LINE:
+      break;
     case REQUEST_SEGMENT:
-    case REQUEST_AREA:
-      printf("Not yet implemented\n");
+      move_symbol_segment(p);
+      break;
     default:
       ASSERT(p->request->type != REQUEST_INVALID);
   }
@@ -1388,8 +1662,16 @@ void move_symbol(struct placement *p)
 
 void move_symbol_point(struct placement *p)
 {
-  p->x += (double) (move_min + randdouble()) * flip(1, -1);
-  p->y += (double) (move_min + randdouble()) * flip(1, -1);
+  p->x += gen_movement_uniform();
+  p->y += gen_movement_uniform();
+}
+
+void move_symbol_segment(struct placement *p)
+{
+  double m = gen_movement_uniform();
+  // CHECK ME
+  p->x += m;
+  p->y += m * ((struct request_segment *) p->request)->slope;
 }
 
 void hide_segment_labels(struct individual *individual)
@@ -1418,13 +1700,16 @@ 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->ind = num_placements++;
   p->request = r;
   p->processed = 0;
   p->x = p->y = 0; // To prevent valgrind from complaining
   p->variant_used = 0;
+  p->map_links = NULL;
+  p->individual = individual;
   switch (r->type)
   {
     case REQUEST_POINT: ;
@@ -1455,7 +1740,8 @@ void init_placement(struct placement *p, struct request *r)
   }
 
   gen_coords(p);
-//  printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
+  if (dbg_init)
+    printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
 }
 
 void init_individual(struct individual *i)
@@ -1463,7 +1749,18 @@ void init_individual(struct individual *i)
 //printf("Initing individual\n");
   GARY_INIT(i->placements, num_requests);
   GARY_INIT(i->map, 0);
+  for (uns j=0; j<num_map_parts; j++)
+  {
+    struct map_part *part = GARY_PUSH(i->map);
+    GARY_INIT(part->placement, 0);
+    struct map_placement *mp = GARY_PUSH(part->placement);
+    mp->placement = &dummy_placement;
+    mp->next = mp->prev = NULL;
+  }
   i->penalty = 0; // FIXME
+
+  if (dbg_init)
+    printf("Individual inited, has %u map parts\n", GARY_SIZE(i->map));
 }
 
 struct placement **get_overlapping(struct placement *p UNUSED)
@@ -1485,8 +1782,7 @@ int flip(int a, int b)
 
 double randdouble(void)
 {
-  // FIXME: How the hell shall double in range <0, 1> be generated? O:)
-  return 0.5;
+  return ((double) rand() / (double) RAND_MAX);
 }
 
 void cleanup(void)
@@ -1499,10 +1795,19 @@ void cleanup(void)
 
 void copy_individual(struct individual *src, struct individual *dest)
 {
-  src->penalty = dest->penalty;
+  dest->penalty = src->penalty;
   GARY_INIT(dest->placements, GARY_SIZE(src->placements));
   for (uns i=0; i<GARY_SIZE(src->placements); i++)
   {
     dest->placements[i] = src->placements[i];
+    dest->placements[i].map_links = NULL;
+  }
+  for (uns j=0; j<num_map_parts; j++)
+  {
+    struct map_part *part = GARY_PUSH(dest->map);
+    GARY_INIT(part->placement, 0);
+    struct map_placement *mp = GARY_PUSH(part->placement);
+    mp->placement = &dummy_placement;
+    mp->next = mp->prev = NULL;
   }
 }