Labelling: Another bunch of changes

diff --git a/labeller.c b/labeller.c
index e8e423b0c0b6de0c81148609f478c41ace62e6b3..ee740ba8451558ba49a019493d5c6a15340c83ee 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -87,6 +87,29 @@ int move_max = 1;
 
 int num_requests = 0;
 
+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);
+
+void make_population(void);
+bool shall_terminate(void);
+void breed(void);
+void mutate(void);
+void elite(void);
+void rank_population(void);
+
+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);
+
+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);
@@ -105,6 +128,32 @@ void gen_coords_area(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 init_placement(struct placement *p, 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);
+
+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);
@@ -156,6 +205,24 @@ void labeller_init(void)
   page_height_int = floor(page_height);
 }
 
+void make_bitmap(struct point_variant *v, struct symbol *sym)
+{
+  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)
 {
   v->width = si->sir.icon->width;
@@ -583,6 +650,42 @@ printf("\n");
   }
 }
 
+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);
+
+  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);
+
+  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;
+
+  struct point_variant *v = malloc(sizeof(struct point_variant));
+  make_bitmap(v, sym);
+  rs->variant = v;
+
+  return rs;
+}
+
 void make_segments(void)
 {
   for (uns i=0; i<GARY_SIZE(longlines); i++)
@@ -591,23 +694,12 @@ void make_segments(void)
     if (! (longlines[i].first && longlines[i].first->label))
       continue;
 
-    printf("New longline\n");
-
-    struct request_line *request = GARY_PUSH(requests_line);
-    request->request.ind = num_requests++;
-    request->request.type = REQUEST_LINE;
-
-    GARY_INIT(request->sections, 0);
-
-    int cur_length = 0;
-    struct request_section *rls = GARY_PUSH(request->sections);
-    rls->request.ind = num_requests++;
-    rls->request.type = REQUEST_SECTION;
-    rls->num_segments = 0;
-    GARY_INIT(rls->segments, 0);
+    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;
-    struct request_segment *rs = NULL;
+    int cur_length = 0;
 
     struct sym_text *st = NULL;
     if (e->label->type == SYMBOLIZER_TEXT)
@@ -621,56 +713,26 @@ void make_segments(void)
       // FIXME;
     }
 
-int dbg_e = 1;
     while (e)
     {
-      printf("Edge %d\n", dbg_e);
-      dbg_e++;
-if (e < (void *) 100)
-{
-  exit(42);
-}
       if ((cur_length + e->length > conf_max_section_length) &&
           !(cur_length + e->length < conf_max_section_overlay))
       {
         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 *n = e->n1->o;
 
-        rs = GARY_PUSH(rls->segments);
-        rs->request.type = REQUEST_SEGMENT;
-        rs->request.ind = num_requests++;
-        rls->num_segments++;
+        rs = make_new_segment(rls, e->label);
         rs->x1 = n->x;
         rs->y1 = n->y;
         // FIXME: Truly compute x2, y2
         rs->x2 = n->x;
         rs->y2 = n->y;
         rs->zindex = e->zindex;
-        rs->label = e->label;
 
-        rls = GARY_PUSH(request->sections);
-        rls->request.ind = num_requests++;
-        rls->request.type = REQUEST_SECTION;
-        rls->num_segments = 0;
+        rs->label = malloc(sizeof(struct sym_text));
+        *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
 
-        struct point_variant *v = malloc(sizeof(struct point_variant));
-        switch (e->label->type)
-        {
-          case SYMBOLIZER_POINT:
-            make_bitmap_point(v, (struct sym_point *) e->label);
-            break;
-          case SYMBOLIZER_ICON:
-            make_bitmap_icon(v, (struct sym_icon *) e->label);
-            break;
-          case SYMBOLIZER_TEXT:
-            make_bitmap_label(v, (struct sym_text *) e->label);
-            break;
-          default:
-            // FIXME
-            ;
-        }
-        rs->variant = v;
-        GARY_INIT(rls->segments, 0);
+        rls = make_new_section(request);
       }
 
       if (st && (e->length < st->tw))
@@ -680,29 +742,9 @@ if (e < (void *) 100)
         continue;
       }
 
-      rs = GARY_PUSH(rls->segments);
-      rls->num_segments++;
-      rs->request.type = REQUEST_SEGMENT;
-      rs->request.ind = num_requests++;
-      rs->label = e->label;
-
-        struct point_variant *v = malloc(sizeof(struct point_variant));
-        switch (e->label->type)
-        {
-          case SYMBOLIZER_POINT:
-            make_bitmap_point(v, (struct sym_point *) e->label);
-            break;
-          case SYMBOLIZER_ICON:
-            make_bitmap_icon(v, (struct sym_icon *) e->label);
-            break;
-          case SYMBOLIZER_TEXT:
-            make_bitmap_label(v, (struct sym_text *) e->label);
-            break;
-          default:
-            // FIXME
-            ;
-        }
-        rs->variant = v;
+      rs = make_new_segment(rls, e->label);
+      rs->label = malloc(sizeof(struct sym_text));
+      *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
 
       rs->x1 = e->n1->o->x;
       rs->y1 = e->n1->o->y;
@@ -710,11 +752,9 @@ if (e < (void *) 100)
       rs->y2 = e->n2->o->y;
 
       rs->angle = atan2(rs->x2 - rs->x1, rs->y2 - rs->y1);
-
       rs->zindex = e->zindex;
 
       cur_length += e->length;
-
       e = e->next;
     }
 
@@ -957,9 +997,15 @@ printf("Will plan symbol at [%.2f; %.2f] on %u\n", population1[0]->placements[i]
     }
   }
 
+  labeller_cleanup();
+
   return;
 }
 
+void labeller_cleanup(void)
+{
+}
+
 void make_population(void)
 {
   for (int i=0; i<conf_pop_size; i++)

diff --git a/labeller.h b/labeller.h
index d8d4db6f62647cf25b1e2f090e7c5f03492903d8..c16c43dd11518a40c37b82733c2f08e4d4aa74a9 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -172,45 +172,4 @@ void labeller_label(void);
 void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 
-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);
-
-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);
-
-void make_population(void);
-bool shall_terminate(void);
-void breed(void);
-void mutate(void);
-void elite(void);
-void rank_population(void);
-
-struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
-void perform_mutation(struct individual *individual);
-
-void init_placement(struct placement *p, 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);
-
-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);
-
 #endif