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

diff --git a/labeller.c b/labeller.c
index 46c6839..345b70c 100644
--- a/labeller.c
+++ b/labeller.c
@@ -1,3 +1,5 @@
+#include <errno.h>
+
 #include <ucw/lib.h>
 #include <ucw/gary.h>
 #include <ucw/mempool.h>
@@ -5,6 +7,7 @@
 
 #include "leo.h"
 #include "sym.h"
+#include "map.h"
 #include "labeller.h"
 
 #define HASH_NODE struct graph_node
@@ -18,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include <fcntl.h>
 
 #define BLOCK_SIZE 4096
 
@@ -27,7 +31,7 @@ static struct request_point *requests_point;
 static struct request_line *requests_line;
 static struct request_area *requests_area;
 
-static struct graph_edge *bfs_queue;
+static struct graph_edge **bfs_queue;
 static struct longline *longlines; int num_longlines;
 static struct buffer_line *buffer_line;
 static struct buffer_linelabel *buffer_linelabel;
@@ -37,6 +41,27 @@ struct eltpool *ep_individuals;
 struct individual **population1;
 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;
+
+int num_edges_dbg;
+int num_nodes;
+int num_edges = 0;
+int dbg_num_hits = 0;
+
 int conf_pop_size = 50;
 
 int conf_penalty_bound = 0;
@@ -50,16 +75,23 @@ 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;
+
+double conf_mutate_rbest = 1;
+double conf_mutate_pop_size = 0.9;
+
+double conf_mutate_move_bound = 1.0;
+double conf_mutate_regen_bound = 0.0;
+double conf_mutate_chvar_bound = 0.0;
 
-int conf_mutate_rbest_perc = 60;
-int conf_mutate_pop_size_perc = 20;
+int mutate_pop_size;
+int mutate_rbest_size;
 
-int conf_mutate_move_bound = 0.2;
-int conf_mutate_regen_bound = 0.1;
-int conf_mutate_chvar_bound = 0.1;
+double conf_elite_pop_size = 0.1;
+int elite_pop_size;
 
-int conf_elite_perc = 5;
+double conf_max_section_length = 100;
+double conf_max_section_overlay = 10;
 
 int old_best = 0; // FIXME: Shall be int max
 int iteration = 0;
@@ -68,51 +100,213 @@ 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);
+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);
+void mutate(void);
+void elite(void);
+void rank_population(void);
+void plan_individual(struct individual *individual);
+
+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);
+struct request_section *make_new_section(struct request_line *rl);
+struct request_segment *make_new_segment(struct request_section *rls, struct symbol *sym);
+
+void dump_bitmaps(struct individual *individual);
+void dump_graph(void);
+void bfs2(void);
+void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir);
+void bfs_wrapper(void);
+void oldbfs(void);
+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);
+
+struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
+void perform_mutation(struct individual *individual);
+
+void hide_segment_labels(struct individual *individual);
+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);
+
+int randint(int min, int max);
+
+struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2);
+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);
+
+int flip(int a, int b);
+double randdouble(void);
+
+void cleanup(void);
+
+void copy_individual(struct individual *src, struct individual *dest);
+
+int max2(int a, int b);
+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);
+}
+
+int min2(int a, int b)
+{
+  return (a < b ? a : b);
+}
+
+int max4(int a, int b, int c, int d)
+{
+  return max2(max2(a, b), max2(c, d));
+}
+
+int min4(int a, int b, int c, int d)
+{
+  return min2(min2(a, b), min2(c, d));
+}
+
+void print_label(struct symbol *sym)
+{
+  switch (sym->type)
+  {
+    case SYMBOLIZER_TEXT: ;
+      struct sym_text *st = (struct sym_text *) sym;
+      printf("%s\n", osm_val_decode(st->text));
+    default:
+      // FIXME
+      ;
+  }
+}
 
 void labeller_init(void)
 {
-//  mpool_requests = mp_new(BLOCK_SIZE);
   GARY_INIT(requests_point, 0);
   GARY_INIT(requests_line, 0);
   GARY_INIT(requests_area, 0);
   GARY_INIT(buffer_line, 0);
   GARY_INIT(buffer_linelabel, 0);
   ep_individuals = ep_new(sizeof(struct individual), 1);
+
+  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 variant *v, struct symbol *sym)
+{
+  v->offset_x = v->offset_y = 0;
+
+  switch (sym->type)
+  {
+    case SYMBOLIZER_POINT:
+      make_bitmap_point(v, (struct sym_point *) sym);
+      break;
+    case SYMBOLIZER_ICON:
+      make_bitmap_icon(v, (struct sym_icon *) sym);
+      break;
+    case SYMBOLIZER_TEXT:
+      make_bitmap_label(v, (struct sym_text *) sym);
+      break;
+    default:
+      ASSERT(sym->type != SYMBOLIZER_INVALID);
+  }
 }
 
-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 UNUSED, struct sym_text *text UNUSED)
+void make_bitmap_label(struct variant *v, struct sym_text *text)
 {
+  v->width = ceil(text->tw);
+  v->height = ceil(text->th);
+  v->bitmap = malloc(v->width * v->height * sizeof(bool));
+  for (int i=0; i<v->height; i++)
+    for (int j=0; j<v->width; j++)
+    {
+      v->bitmap[i*v->width + j] = 1;
+    }
 }
 
 void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex)
 {
-/* FIXME
-   What does correct check look like?
+  if (dbg_requests)
+    printf("Adding point\n");
   if (object->type != OSM_TYPE_NODE)
   {
-    // FIXME
+    printf("Warning: Point label requested on non-point object\n");
     return;
   }
-*/
 
   struct request_point *r = GARY_PUSH(requests_point);
 
@@ -120,38 +314,39 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t
   r->request.ind = num_requests++;
 
   r->sym = sym;
-  r->object = object;
   r->zindex = zindex;
 
-  struct osm_node *n = (struct osm_node *) object;
-  r->x = n->x;
-  r->y = n->y;
-
   r->offset_x = 0;
   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);
-      break;
-    case SYMBOLIZER_POINT:
-      make_bitmap_point(v, (struct sym_point *) sym);
+      // FIXME: Really?
+      r->x = ((struct sym_icon *)sym)->sir.x;
+      r->y = ((struct sym_icon *)sym)->sir.y;
       break;
     default:
-      // Oops :)
       // FIXME
       return;
   }
+
+//  printf("Inited point to [%.2f; %.2f] on %u\n", r->x, r->y, r->zindex);
 }
 
 void labeller_add_line(struct symbol *sym, z_index_t 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;
@@ -160,26 +355,38 @@ void labeller_add_line(struct symbol *sym, z_index_t zindex)
 
 void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
 {
+  if (o->type != OSM_TYPE_WAY)
+  {
+    // FIXME
+    return;
+  }
+
+  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->text = (struct sym_text *) sym;
+  ll->label = sym;
   ll->zindex = zindex;
 }
 
-void labeller_add_arealabel(struct symbol *sym UNUSED, struct osm_object *o, z_index_t zindex)
+void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
 {
+  if (dbg_requests)
+    printf("Adding area on %u\n", zindex);
   struct request_area *r = GARY_PUSH(requests_area);
 
-  r->request.type = REQUEST_AREALABEL;
+  r->request.type = REQUEST_AREA;
   r->request.ind = num_requests++;
 
   r->o = (struct osm_multipolygon *) o;
   r->zindex = zindex;
-  r->sym = (struct sym_text *) sym;
+  r->label = sym;
 
-  GARY_INIT(r->text_variant, 0);
-  struct point_variant *v = GARY_PUSH(r->text_variant);
-  make_bitmap_label(v, r->sym);
+  osm_obj_center(o, &(r->cx), &(r->cy));
+
+  GARY_INIT(r->request.variants, 0);
+  struct variant *v = GARY_PUSH(r->request.variants);
+  make_bitmap(v, sym);
 }
 
 void make_graph(void)
@@ -205,6 +412,8 @@ void make_graph(void)
         g_node = hash_new(ref->o->id);
         GARY_INIT(g_node->edges, 0);
         g_node->o = o_node;
+        g_node->id = ref->o->id;
+        g_node->num = num_nodes++;
       }
 
       if (! g_prev)
@@ -214,33 +423,74 @@ void make_graph(void)
         continue;
       }
 
-      struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge));
+      struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge)); num_edges_dbg++;
+      e->num = num_edges++;
       e->id = buffer_line[i].line->s.o->id;
       e->color = buffer_line[i].line->color;
       e->length = hypot(abs(o_prev->x - o_node->x), abs(o_prev->y - o_node->y));
-      e->visited = 0;
+      e->visited = -1;
       e->prev = NULL;
       e->next = NULL;
       e->n1 = g_prev;
       e->n2 = g_node;
       e->longline = (uns) -1;
-      e->text = NULL;
-      e->sym = buffer_line[i].line;
+      e->line = buffer_line[i].line;
+      e->dir = DIR_UNSET;
+      e->label = NULL;
 
       struct graph_edge **edge = GARY_PUSH(g_prev->edges);
       *edge = e;
       edge = GARY_PUSH(g_node->edges);
       *edge = e;
+
+      g_prev = g_node;
+      o_prev = o_node;
     }
   }
+
+  printf("Made graph with %d edges\n", num_edges_dbg);
+}
+
+void dump_graph(void)
+{
+  HASH_FOR_ALL(hash, node)
+  {
+    printf("* Node: (%d) #%ju [%.2f; %.2f]\n", node->num, node->id, node->o->x, node->o->y);
+    for (uns i=0; i<GARY_SIZE(node->edges); i++)
+    {
+      struct graph_edge *e = node->edges[i];
+      printf("\t edge (%d) #%ju to ", e->num, e->id);
+      if (node->edges[i]->n1->id == node->id)
+        printf("(%d) #%ju [%.2f; %.2f]\n", e->n2->num, e->n2->id, e->n2->o->x, e->n2->o->y);
+      else if (node->edges[i]->n2->id == node->id)
+        printf("(%d) #%ju [%.2f; %.2f]\n", e->n1->num, e->n1->id, e->n1->o->x, e->n1->o->y);
+      else
+        printf("BEWARE! BEWARE! BEWARE!\n");
+
+      printf("\t\t");
+      if ((node->edges[i]->label)) printf("Labelled\n");
+      if ((node->edges[i]->label) && (node->edges[i]->label->type == SYMBOLIZER_TEXT)) printf(" labelled %s;", osm_val_decode(((struct sym_text *) node->edges[i]->label)->text));
+      printf(" colored %d;", node->edges[i]->color);
+      printf("   length %.2f", node->edges[i]->length);
+      printf("\n");
+    }
+  }
+  HASH_END_FOR;
 }
 
 void label_graph(void)
 {
+  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)
+    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)
     {
+      if (dbg_graph)
+        printf("Looking for node %ju\n", ref->o->id);
       struct graph_node *n = hash_find(ref->o->id);
       if (n == NULL)
       {
@@ -248,11 +498,15 @@ void label_graph(void)
       }
       else
       {
+        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)
           {
-            n->edges[j]->text = buffer_linelabel[i].text;
+            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;
           }
         }
@@ -261,75 +515,115 @@ void label_graph(void)
   }
 }
 
-void join_edge(struct graph_edge *e, int dir)
+void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir)
 {
-  struct graph_node *other_node = NULL;
-  switch (dir)
-  {
-    case 1:
-      other_node = e->n2;
-      break;
-    case 2:
-      other_node = e->n1;
-      break;
-    // FIXME: default?
-  }
-
+  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(other_node->edges); i++)
+
+  for (uns i=0; i<GARY_SIZE(node->edges); i++)
   {
-    struct graph_edge *other = other_node->edges[i];
-    if (! other->visited)
-    {
-    struct graph_edge **new = GARY_PUSH(bfs_queue);
-    *new = other_node->edges[i];
+    struct graph_edge *other = node->edges[i];
+    if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue;
+
+    if ((uns) other->visited != e->longline) {
+    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;
     }
 
-    if ((!other->visited) && (e->text) && (other->text) && (e->text->text == other->text->text))
+    if (((other->n1->id == node->id) && (other->n2->id == anode->id)) ||
+        ((other->n2->id == node->id) && (other->n1->id == anode->id)))
+        continue;
+
+    if (((other->n1->id == node->id) || (other->n2->id == node->id)) &&
+        (e->label) && (other->label) &&
+        (e->label->type == SYMBOLIZER_TEXT) && (other->label->type == SYMBOLIZER_TEXT) &&
+        (((struct sym_text *) e->label)->text == ((struct sym_text *) other->label)->text))
     {
-      if (e->color == other_node->edges[i]->color)
-      {
-        if ((!candidate) || (candidate->length < other->length))
-        {
-          candidate = other;
-        }
-      }
-      else
-      {
-        // Beware: Name conflict here
-      }
+      if (! candidate || (other->length > candidate->length))
+      candidate = other;
     }
   }
 
   if (candidate)
   {
-    candidate->longline = e->longline;
-    if (dir == 1)
-    {
-      if (candidate->n2 != e->n1)
+    if (dbg_bfs)
+      printf("New line in longline %u\n", e->longline);
+    struct graph_edge *other = candidate;
+      other->longline = e->longline;
+      other->dir = dir;
+      if (((dir == DIR_BWD) && (other->n1->id == node->id)) ||
+          ((dir == DIR_FWD) && (other->n2->id == node->id)))
+      {
+        struct graph_node *swp = other->n2;
+        other->n2 = other->n1;
+        other->n1 = swp;
+      }
+
+      switch (dir)
       {
-	candidate->n1 = candidate->n2;
-	candidate->n2 = e->n1;
+        case DIR_BWD:
+          e->prev = other;
+          other->next = e;
+          longlines[other->longline].first = other;
+          break;
+        case DIR_FWD:
+          e->next = other;
+          other->prev = e;
+          break;
+        default:
+          printf("Oops\n");
+          ASSERT(0);
       }
-      e->prev = candidate;
-      candidate->next = e;
+  }
+}
+
+void bfs(uns longline)
+{
+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];
+    if (dbg_bfs)
+      printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue));
+    //ASSERT(! cur->visited);
+
+    cur->visited = longline;
+
+    if (cur->longline == (uns) -1)
+      continue;
 
-      longlines[e->longline].first = candidate;
+    if (cur->dir == DIR_UNSET)
+    {
+      cur->dir = DIR_CENTER;
+      bfs_edge(cur, cur->n1, cur->n2, DIR_BWD);
+      bfs_edge(cur, cur->n2, cur->n1, DIR_FWD);
     }
     else
     {
-      if (candidate->n1 != e->n2)
+      switch (cur->dir)
       {
-	candidate->n2 = candidate->n1;
-	candidate->n1 = e->n2;
+        case DIR_BWD:
+          bfs_edge(cur, cur->n1, cur->n2, cur->dir);
+          break;
+        case DIR_FWD:
+          bfs_edge(cur, cur->n2, cur->n1, cur->dir);
+          break;
+        default:
+          // FIXME
+          ;
       }
-      e->next = candidate;
-      candidate->prev = e;
     }
   }
 }
 
-void bfs(void)
+void bfs_wrapper(void)
 {
   GARY_INIT(bfs_queue, 0);
   GARY_INIT(longlines, 0);
@@ -338,31 +632,25 @@ void bfs(void)
   {
     for (uns i=0; i<GARY_SIZE(node->edges); i++)
     {
-      struct graph_edge *e = node->edges[i];
-
-//      printf("Examining edge from [%.2f; %.2f] to [%.2f; %.2f]\n",
-//              e->n1->o->x, e->n1->o->y, e->n2->o->x, e->n2->o->y);
-
-      // if (e->visited) HASH_CONTINUE; // FIXME: Is is correct?
-      if (e->visited) continue;
-//      printf("Continuing\n");
-      if (e->longline == (uns) -1)
+      if ((node->edges[i]->label) && (node->edges[i]->longline == (uns) -1))
       {
         GARY_PUSH(longlines);
-        e->longline = num_longlines++;
-        longlines[e->longline].first = e;
-      }
-//      printf("Longline is %u\n", e->longline);
-
-      e->visited = 1;
-
-      if (! e->prev)
-      {
-        join_edge(e, 1);
-      }
-      if (! e->next)
-      {
-        join_edge(e, 2);
+        longlines[num_longlines].first = node->edges[i];
+        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();
+        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++;
       }
     }
   }
@@ -371,174 +659,492 @@ void bfs(void)
   GARY_FREE(bfs_queue);
 }
 
-void make_segments(void)
+void dump_longlines(void)
 {
+printf("*** Longlines dump\n");
   for (uns i=0; i<GARY_SIZE(longlines); i++)
   {
-    if (! longlines[i].first->text) continue;
-//    printf("Survived! %s\n", osm_val_decode(longlines[i].first->text->text));
-printf("New longline\n");
-    struct request_line *request = GARY_PUSH(requests_line);
-    request->request.ind = -1;
-    request->request.type = REQUEST_LINELABEL;
+printf("Longline %u:", i);
+    struct graph_edge *e = longlines[i].first;
+if ((e->label) && (e->label->type == SYMBOLIZER_TEXT))
+  printf(" labelled %s", osm_val_decode(((struct sym_text *) e->label)->text));
+printf("\n");
+
+    while (e)
+    {
+      printf("\t#%ju (%d): [%.2f; %.2f] -- [%.2f; %.2f] (dir %d)\n",
+             e->id, e->num, e->n1->o->x, e->n1->o->y, e->n2->o->x, e->n2->o->y, e->dir);
+
+      e = e->next;
+    }
+  }
+}
+
+struct request_line *make_new_line(void)
+{
+  struct request_line *rl = GARY_PUSH(requests_line);
+  rl->request.ind = num_requests++;
+  rl->request.type = REQUEST_LINE;
+  GARY_INIT(rl->sections, 0);
+  GARY_INIT(rl->request.variants, 0);
+
+  return rl;
+}
+
+struct request_section *make_new_section(struct request_line *rl)
+{
+  struct request_section *rls = GARY_PUSH(rl->sections);
+  rls->request.ind = num_requests++;
+  rls->request.type = REQUEST_SECTION;
+  rls->num_segments = 0;
+  GARY_INIT(rls->segments, 0);
+  GARY_INIT(rls->request.variants, 0);
+
+  return rls;
+}
+
+struct request_segment *make_new_segment(struct request_section *rls, struct symbol *sym)
+{
+  struct request_segment *rs = GARY_PUSH(rls->segments);
+  rls->num_segments++;
+
+  rs->request.ind = num_requests++;
+  rs->request.type = REQUEST_SEGMENT;
+
+  GARY_INIT(rs->request.variants, 0);
+  struct variant *v = GARY_PUSH(rs->request.variants);
+  make_bitmap(v, sym);
+
+  return rs;
+}
+
+void cut_edge(struct graph_edge *e, double dist)
+{
+  if (dbg_segments)
+    printf("Cutting [%.2f; %.2f] -- [%.2f; %.2f] to dist %.2f\n", e->n1->o->x, e->n1->o->y, e->n2->o->x, e->n2->o->y, dist);
+
+  struct graph_edge *new = malloc(sizeof(struct graph_edge));
+  *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;
+
+  // FIXME
+  if ((n1->x == n2->x) && (n1->y == n2->y))
+  {
+    printf("[%.2f; %.2f] -- [%.2f; %.2f]\n", n1->x, n1->y, n2->x, n2->y);
+    printf("Won't cut point\n");
+    return;
+  }
 
-    GARY_INIT(request->segments, 0);
-    request->num_segments = 0;
+  struct osm_node *n11 = malloc(sizeof(struct osm_node));
+  struct graph_node *gn = malloc(sizeof(struct graph_node));
+  gn->o = n11;
+  double vsize = sqrt(pow(n1->x - n2->x, 2) + pow(n1->y - n2->y, 2));
+  n11->x = n1->x + (n2->x - n1->x) / vsize * dist;
+  n11->y = n1->y + (n2->y - n1->y) / vsize * dist;
 
-    // ->num_variants FIXME
-    // ->variants FIXME
+  e->n2 = new->n1 = gn;
+
+  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)
+{
+  for (uns i=0; i<GARY_SIZE(longlines); i++)
+  {
+    // Skip lines which are not labelled
+    if (! (longlines[i].first && longlines[i].first->label))
+      continue;
+
+    struct request_line *request = make_new_line();
+    struct request_section *rls = make_new_section(request);
+    struct request_segment *rs = NULL;
 
     struct graph_edge *e = longlines[i].first;
+    double cur_length = 0;
 
-    if (! e) printf("Oops\n");
-    num_requests++;
+    struct sym_text *st = NULL;
+    if (e->label->type == SYMBOLIZER_TEXT)
+    {
+      st = (struct sym_text *) e->label;
+    }
+    else
+    {
+      if (dbg_segments)
+        printf("Warning: Skipping line\n");
+      continue;
+      // FIXME;
+    }
+
+    if (dbg_segments)
+      printf("New longline\n");
     while (e)
     {
-      if (! e->text) break;
-      struct request_segment *r = GARY_PUSH(request->segments);
-      request->num_segments++;
+      if (e->visited < 0)
+      {
+        printf("BEWARE: Edge cycle\n");
+        break;
+      }
+      e->visited = -1; // FIXME
+
+      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");
+        continue;
+      }
 
-      r->request.ind = num_requests++;
-      r->request.type = REQUEST_SEGMENT;
+      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));
+      }
 
-      struct osm_node *n = e->n1->o;
-      r->x1 = n->x;
-      r->y1 = n->y;
-      n = e->n2->o;
-      r->x2 = n->x;
-      r->y2 = n->y;
-      r->k = abs(r->x2 - r->x1) / (abs(r->y2 - r->y1) + 0.001); // FIXME: Hack to prevent floating point exception when y2 = y1
+      rs = make_new_segment(rls, e->label);
+      rs->label = malloc(sizeof(struct sym_text));
+      *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
 
-printf("Segment [%.2f; %.2f] -- [%.2f; %.2f]\n", r->x1, r->y1, r->x2, r->y2);
+      rs->x1 = e->n1->o->x;
+      rs->y1 = e->n1->o->y;
+      rs->x2 = e->n2->o->x;
+      rs->y2 = e->n2->o->y;
 
-      r->sym = e->sym;
-      r->zindex = e->zindex;
-      r->text = malloc(sizeof(struct sym_text));
-      *(r->text) = *(e->text);
-      r->text->x = r->x1;
-      r->text->y = r->y1;
+      rs->slope = (rs->y2 - rs->y1) / (rs->x2 - rs->x1);
+      rs->zindex = e->zindex;
 
-      r->variant = malloc(sizeof(struct point_variant)); // FIXME
-      make_bitmap_label(r->variant, e->text);
+      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;
     }
+
+    if (request->sections[0].num_segments == 0)
+    {
+      // FIXME
+      printf("WARNING: 0 segment section\n");
+      GARY_POP(requests_line);
+      num_requests -= 2;
+    }
   }
 }
 
-void labeller_label(void)
+void dump_linelabel_requests(void)
 {
-  make_graph();
-  label_graph();
-  bfs();
-  make_segments();
+  for (uns i=0; i<GARY_SIZE(requests_line); i++)
+  {
+    if (requests_line[i].sections[0].num_segments == 0)
+    {
+      printf("HEY!\n");
+      continue;
+    }
+    printf("Request for linelabel, %d sections\n", GARY_SIZE(requests_line[i].sections));
+    print_label(requests_line[i].sections[0].segments[0].label);
+    for (uns j=0; j<GARY_SIZE(requests_line[i].sections); j++)
+    {
+      printf("%d section, %d segments\n", j, GARY_SIZE(requests_line[i].sections[j].segments));
+      for (uns k=0; k<GARY_SIZE(requests_line[i].sections[j].segments); k++)
+      {
+        struct request_segment *rs = &requests_line[i].sections[j].segments[k];
+        printf("[%.2f; %.2f] -- [%.2f; %.2f]\n", rs->x1, rs->y1, rs->x2, rs->y2);
+      }
+    }
+    printf("\n");
+  }
+}
 
-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));
+void dump_bitmaps(struct individual *individual)
+{
+  bool *bitmap = malloc(page_width_int * page_height_int * sizeof(bool));
+  printf("Bitmap size is %d\n", page_width_int * page_height_int);
+  for (int i=0; i<page_height_int; i++)
+    for (int j=0; j<page_width_int; j++)
+      bitmap[i*page_width_int + j] = 0;
 
-  GARY_INIT(population1, conf_pop_size);
-  GARY_INIT(population2, conf_pop_size);
-  make_population();
+  for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+  {
+    if (individual->placements[i].variant_used == -1) continue;
 
-  printf("Dealing with %d requests\n", num_requests);
+    struct placement *p = &(individual->placements[i]);
+    struct variant *v = NULL;
 
-  while (! shall_terminate())
+    switch (p->request->type)
+    {
+      case REQUEST_SEGMENT: ;
+      case REQUEST_POINT: ;
+      case REQUEST_AREA: ;
+        v = &(p->request->variants[p->variant_used]);
+        break;
+      default:
+        ASSERT(p->request->type != REQUEST_INVALID);
+        continue;
+    }
+
+    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++)
+      {
+        bitmap[row * page_width_int + col] = 1;
+      }
+    }
+  }
+
+  errno = 0;
+  FILE *fd_dump = fopen("dump.pbm", "w");
+  fprintf(fd_dump, "P1\n");
+  fprintf(fd_dump, "%d %d\n", page_width_int, page_height_int);
+  for (int i=0; i<page_height_int; i++)
   {
-    iteration++;
+    for (int j=0; j<page_width_int; j++)
+    {
+      fprintf(fd_dump, "%d", bitmap[(int) (i*page_width_int + j)] ? 1 : 0);
+    }
+    fprintf(fd_dump, "\n");
+  }
+  fclose(fd_dump);
+}
 
-    struct individual **swp = population1;
-    population1 = population2;
-    population2 = swp;
-    pop2_ind = 0;
+void dump_individual(struct individual *individual)
+{
+printf("*** Dumping INDIVIDUAL ***\n");
+printf("(There are %d requests)\n", num_requests);
+  for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+  {
+    struct placement *p = &(individual->placements[i]);
+
+    switch (p->request->type)
+    {
+      case REQUEST_POINT:
+        printf("Point at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_point *) p->request)->zindex);
+        break;
+      case REQUEST_LINE: ;
+        struct request_line *rl = (struct request_line *) p->request;
+        printf("Line: ");
+        print_label(rl->sections[0].segments[0].label);
+        break;
+      case REQUEST_SECTION: ;
+        printf("*");
+        break;
+      case REQUEST_SEGMENT: ;
+        if (p->variant_used >= 0)
+          printf("Segment placed at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_segment *) p->request)->zindex);
+        else
+          printf("Segment not placed\n");
+        break;
+      case REQUEST_AREA: ;
+        struct request_area *ra = (struct request_area *) p->request;
+        printf("Area label ");
+        print_label(ra->label);
+        printf(" at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_area *) p->request)->zindex);
+        break;
+      default:
+        printf("Testing request type (dump_individual)\n");
+        ASSERT(p->request->type != 0);
+    }
   }
+  printf("\nTotal penalty: %d\n", individual->penalty);
+}
 
-  for (uns i=0; i<GARY_SIZE(population1[0]->placements); i++)
+void plan_individual(struct individual *individual)
+{
+  for (uns i=0; i<GARY_SIZE(individual->placements); i++)
   {
-    switch (population1[0]->placements[i].request->type)
+    struct symbol *s = NULL;
+    z_index_t zindex = 0;
+    if (individual->placements[i].variant_used < 0) continue;
+    switch (individual->placements[i].request->type)
     {
       case REQUEST_POINT: ;
-        struct request_point *rp = (struct request_point *) population1[0]->placements[i].request;
-        switch (rp->sym->type)
-        {
-          case SYMBOLIZER_POINT: ;
-	    struct sym_point *sp = (struct sym_point *) rp->sym;
-	    sp->x = i*10;
-	    sp->y = i*10;
-            sym_plan((struct symbol *) sp, rp->zindex);
-	    break;
-	  case SYMBOLIZER_ICON: ;
-	    struct sym_icon *si = (struct sym_icon *) rp->sym;
-	    si->sir.x = population1[0]->placements[i].x;
-	    si->sir.y = population1[0]->placements[i].y;
-            sym_plan((struct symbol *) si, rp->zindex);
-	    break;
-	  default:
-	    ;
-        }
+        struct request_point *rp = (struct request_point *) individual->placements[i].request;
+        s = rp->sym;
+        zindex = rp->zindex;
+        break;
+      case REQUEST_SEGMENT: ;
+        struct request_segment *rs = (struct request_segment *) individual->placements[i].request;
+        s = rs->label;
+        zindex = rs->zindex;
         break;
-      case REQUEST_AREALABEL: ;
-        struct request_area *ra = (struct request_area *) population1[0]->placements[i].request;
-        sym_plan((struct symbol *) ra->sym, ra->zindex);
+      case REQUEST_LINE: ;
         break;
+      case REQUEST_AREA: ;
+        struct request_area *ra = (struct request_area *) individual->placements[i].request;
+        s = ra->label;
+        zindex = ra->zindex;
+        break;
+      default:
+        ASSERT(individual->placements[i].request != REQUEST_INVALID);
+        continue;
+    }
 
-      case REQUEST_LINELABEL: ;
-        struct request_line *rl = (struct request_line *) population1[0]->placements[i].request;
-        for (uns j=0; j<GARY_SIZE(rl->segments); j++)
-        {
-          printf("Planning text %s to [%.2f; %.2f]\n", osm_val_decode(rl->segments[j].text->text), rl->segments[j].text->x, rl->segments[j].text->y);
-          rl->segments[j].text->next_duplicate = NULL;
-          rl->segments[j].text->next_in_tile = NULL;
-          sym_plan((struct symbol *) rl->segments[j].text, rl->segments[j].zindex); // FIXME: z-index
-        }
+if (dbg_plan)
+  printf("Will plan symbol at [%.2f; %.2f] on %u\n", individual->placements[i].x, individual->placements[i].y, zindex);
 
+    if (s) switch (s->type)
+    {
+      case SYMBOLIZER_POINT: ;
+        struct sym_point *sp = (struct sym_point *) s;
+        sp->x = individual->placements[i].x;
+        sp->y = individual->placements[i].y;
+        sym_plan((struct symbol *) sp, zindex);
+        break;
+      case SYMBOLIZER_ICON: ;
+	struct sym_icon *si = (struct sym_icon *) s;
+	si->sir.x = individual->placements[i].x;
+	si->sir.y = individual->placements[i].y;
+        sym_plan((struct symbol *) si, zindex);
+	break;
+      case SYMBOLIZER_TEXT: ;
+        struct sym_text *st = (struct sym_text *) s;
+        st->x = individual->placements[i].x;
+        st->y = individual->placements[i].y;
+        st->next_duplicate = NULL;
+        if (dbg_plan) printf("Planning text %s at [%.2f; %.2f] on %u, with rotation %.2f\n", osm_val_decode(st->text), st->x, st->y, zindex, st->rotate);
+        sym_plan((struct symbol *) st, zindex);
+        break;
+      default:
+        ASSERT(s->type != SYMBOLIZER_INVALID);
     }
   }
+}
 
-  return;
+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();
+  bfs_wrapper();
+  make_segments();
+
+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);
 
-    breed();
     mutate();
     elite();
-    rank_population();
-    // sort population by fitness
 
     struct individual **swp = population1;
     population1 = population2;
-    printf("Swapped populations\n");
     population2 = swp;
-    // GARY_RESIZE(population2, 0) -- is it needed?
     pop2_ind = 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]);
+
+  labeller_cleanup();
+
+  return;
+}
+
+void labeller_cleanup(void)
+{
 }
 
 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;
+
+    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]);
-      for (uns k=0; k<GARY_SIZE(requests_line[j].segments); k++)
+      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].segments[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++]), 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);
+
     ASSERT(p == num_requests);
   }
 }
@@ -640,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++;
   }
@@ -655,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;
     }
@@ -674,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:
+          ;
       }
     }
   }
@@ -684,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)
@@ -701,12 +1518,62 @@ void gen_coords(struct placement *p)
   {
     case REQUEST_POINT:
       gen_coords_point(p);
+      break;
+    case REQUEST_AREA:
+      gen_coords_area(p);
+      break;
+    case REQUEST_SEGMENT:
+      gen_coords_segment(p);
+      break;
+    case REQUEST_LINE:
+      if (dbg_movement)
+        printf("Not yet implemented\n");
+      break;
+    default:
+      if (dbg_movement)
+        printf("Testing request type\n");
+      ASSERT(p->request->type != REQUEST_INVALID);
   }
+
+  update_map_parts(p);
 }
 
-void gen_coords_point(struct placement *p UNUSED)
+double gen_movement(void)
 {
-  // FIXME
+  double m = (random() % 100000) / 10000;
+  m = pow(m, 1.0/3) * flip(1, -1);
+  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();
+}
+
+void gen_coords_segment(struct placement *p)
+{
+  struct request_segment *rs = (struct request_segment *) p->request;
+  int a = flip(1, 2);
+  p->x = (a == 1 ? rs->x1 : rs->x2);
+  p->y = (a == 1 ? rs->y1 : rs->y2);
+}
+
+void gen_coords_area(struct placement *p)
+{
+  struct request_area *ra = (struct request_area *) p->request;
+
+  p->x = p->x + gen_movement();
+  p->y = p->y + gen_movement();
+
+  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)
@@ -730,6 +1597,7 @@ struct map_part **get_parts(struct placement *symbol, struct individual *individ
 
 int randint(int min, int max)
 {
+  if (min == max) return min;
   int r = random();
   //printf("Returning %d + (%d %% (%d - %d)) = %d + %d %% %d = %d + %d = %d\n", min, r, max, min, min, r, max-min, min, r%(max-min), min+(r%(max-min)));
   return min + (r % (max - min));
@@ -781,21 +1649,99 @@ void move_symbol(struct placement *p)
   switch (p->request->type)
   {
     case REQUEST_POINT:
+    case REQUEST_AREA:
       move_symbol_point(p);
+      break;
+    case REQUEST_SEGMENT:
+      move_symbol_segment(p);
+      break;
+    default:
+      ASSERT(p->request->type != REQUEST_INVALID);
   }
 }
 
 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 init_placement(struct placement *p, struct request *r)
+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)
+{
+  // BEWARE: This fully depends on current genetic encoding
+
+  int used = -1, num = -1;
+  for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+  {
+    switch (individual->placements[i].request->type)
+    {
+      case REQUEST_SECTION:
+        used = individual->placements[i].variant_used;
+        num = 0;
+        break;
+      case REQUEST_SEGMENT:
+        if (num == used)
+          individual->placements[i].variant_used = 0;
+        else
+          individual->placements[i].variant_used = -1;
+        num++;
+        break;
+      default:
+        ;
+    }
+  }
+}
+
+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: ;
+      struct request_point *rp = (struct request_point *) r;
+      p->x = rp->x;
+      p->y = rp->y;
+      break;
+    case REQUEST_LINE: ;
+      break;
+    case REQUEST_SECTION: ;
+      struct request_section *rls = (struct request_section *) r;
+      p->variant_used = randint(0, rls->num_segments);
+      break;
+    case REQUEST_SEGMENT: ;
+      struct request_segment *rs = (struct request_segment *) r;
+      p->x = rs->x2;
+      p->y = rs->y2;
+      break;
+    case REQUEST_AREA: ;
+      struct request_area *ra = (struct request_area *) r;
+      p->x = ra->cx;
+      p->y = ra->cy;
+      p->variant_used = 0;
+      break;
+    default:
+      ASSERT(p->request->type != REQUEST_INVALID);
+      printf("Valid request: %d\n", p->request->type);
+  }
+
+  gen_coords(p);
+  if (dbg_init)
+    printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
 }
 
 void init_individual(struct individual *i)
@@ -803,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)
@@ -825,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)
@@ -839,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;
   }
 }