From 5e88baddcadccee35aa111cffd12e7cbe56ca501 Mon Sep 17 00:00:00 2001 From: Karryanna Date: Thu, 14 May 2015 01:23:26 +0200 Subject: [PATCH] Labelling: Generally making code nicer :) Cleanup, reorganization, small fixes, parameters changes, ... --- labeller.c | 458 +++++++++++++++++++++++++++------------------------- sym-point.c | 10 -- sym-text.c | 5 - 3 files changed, 240 insertions(+), 233 deletions(-) diff --git a/labeller.c b/labeller.c index 3c1a87b..c208c59 100644 --- a/labeller.c +++ b/labeller.c @@ -1,5 +1,3 @@ -#include - #include #include #include @@ -22,11 +20,10 @@ #include #include #include +#include #define BLOCK_SIZE 4096 -//struct mempool *mpool_requests; - static struct request_point *requests_point; static struct request_line *requests_line; static struct request_area *requests_area; @@ -51,14 +48,13 @@ int dbg_movement = VERBOSITY_NONE; int dbg_init = VERBOSITY_NONE; int dbg_overlaps = VERBOSITY_NONE; int dbg_rank = VERBOSITY_NONE; -int dbg_evolution = VERBOSITY_NONE; +int dbg_evolution = VERBOSITY_INDIVIDUAL; int dbg_mutation = VERBOSITY_NONE; int dbg_breeding = VERBOSITY_NONE; int page_width_int; int page_height_int; -int num_edges_dbg; int num_nodes; int num_edges = 0; int dbg_num_hits = 0; @@ -67,63 +63,55 @@ int conf_pop_size = 50; int conf_penalty_bound = 0; int conf_stagnation_bound = 0; -int conf_iteration_limit = 4; +int conf_iteration_limit = 100; int conf_term_cond = TERM_COND_ITERATIONS; -int conf_breed_rbest_perc = 80; -int conf_breed_pop_size_perc = 20; -int conf_breed_perc = 50; // Percentage of new pop created by breeding +double conf_breed_pop_size = 0.4; +double conf_breed_rbest = 0.2; + +int breed_pop_size; +int breed_rbest_size; bool conf_mutate_children = 1; -double conf_mutate_children_prob = 0.3; +double conf_mutate_children_prob = 1.0; -double conf_mutate_rbest = 1; -double conf_mutate_pop_size = 0.9; +double conf_mutate_pop_size = 0.4; +double conf_mutate_rbest = 0.2; -double conf_mutate_move_bound = 1.0; +double conf_mutate_move_bound = 0.1; double conf_mutate_regen_bound = 0.0; double conf_mutate_chvar_bound = 0.0; int mutate_pop_size; int mutate_rbest_size; -double conf_elite_pop_size = 0.1; +double conf_elite_pop_size = 0.2; int elite_pop_size; double conf_max_section_length = 100; double conf_max_section_overlay = 10; -int old_best = 0; // FIXME: Shall be int max +int old_best = INT_MAX; int iteration = 0; int pop2_ind; -int conf_part_size = 50; - +// In milimeters int move_min = 0; int move_max = 5; int num_requests = 0; int num_placements = 0; +// In milimeters int conf_map_part_width = 5; int conf_map_part_height = 5; + uns num_map_parts_row; uns num_map_parts_col; uns 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); - -double get_distance(struct placement *p); -double individual_distances(struct individual *individual); +void compute_sizes(void); void make_population(void); bool shall_terminate(void); @@ -133,6 +121,18 @@ void elite(void); void rank_population(void); void plan_individual(struct individual *individual); +int overlaps(struct placement *p1, struct placement *p2); +int get_overlap(struct placement *p); +int individual_overlap(struct individual *individual); + +double get_distance(struct placement *p); +double individual_distances(struct individual *individual); + +struct individual **perform_crossover(struct individual *parent1, struct individual *parent2); +void perform_mutation(struct individual *individual); +void init_placement(struct placement *p, struct individual *individual, struct request *r); +void init_individual(struct individual *i); +void copy_individual(struct individual *src, struct individual *dest); int cmp_individual(const void *a, const void *b); void make_bitmap(struct variant *v, struct symbol *sym); @@ -140,25 +140,13 @@ 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 move_symbol(struct placement *p); +void move_symbol_point(struct placement *p); +void move_symbol_segment(struct placement *p); +void hide_segment_labels(struct individual *individual); + void gen_coords(struct placement *p); void gen_coords_point(struct placement *p); void gen_coords_segment(struct placement *p); @@ -166,37 +154,36 @@ void gen_coords_area(struct placement *p); struct map_part **get_map_parts(struct placement *p); void update_map_parts(struct placement *p); +struct placement **get_closure(struct placement *placement); +void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child, bool **processed_ptr); +struct placement **get_overlapping(struct placement *p); +struct placement **filter(struct placement **list, bool **pred_ptr); -void make_segments_old(void); -void labeller_cleanup(void); +void make_graph(void); +void label_graph(void); +void bfs_wrapper(void); +void bfs(uns longline); +void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir); +void make_segments(void); -struct individual **perform_crossover(struct individual *parent1, struct individual *parent2); -void perform_mutation(struct individual *individual); +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 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); +void dump_bitmaps(struct individual *individual); +void dump_graph(void); +void dump_longlines(void); +void dump_linelabel_requests(void); +void dump_individual(struct individual *individual); +void dump_label(struct symbol *sym); +void dump_penalties(struct individual **population); int randint(int min, int max); - -struct placement **get_closure(struct placement *placement); -void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child, bool **processed_ptr); -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); -struct placement **filter(struct placement **list, bool **pred_ptr); - 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); @@ -224,7 +211,7 @@ int min4(int a, int b, int c, int d) return min2(min2(a, b), min2(c, d)); } -void print_label(struct symbol *sym) +void dump_label(struct symbol *sym) { switch (sym->type) { @@ -246,12 +233,7 @@ void labeller_init(void) 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; + compute_sizes(); } void make_bitmap(struct variant *v, struct symbol *sym) @@ -304,7 +286,7 @@ void make_bitmap_label(struct variant *v, struct sym_text *text) void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex) { - if (dbg_requests) + if (dbg_requests >= VERBOSITY_PLACEMENT) printf("Adding point\n"); if (object->type != OSM_TYPE_NODE) { @@ -344,12 +326,13 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t return; } -// printf("Inited point to [%.2f; %.2f] on %u\n", r->x, r->y, r->zindex); + if (dbg_requests >= VERBOSITY_PLACEMENT) + 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) + if (dbg_requests >= VERBOSITY_PLACEMENT) printf("Adding line on %u\n", zindex); struct buffer_line *b = GARY_PUSH(buffer_line); b->line = (struct sym_line *) sym; @@ -361,12 +344,12 @@ void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t { if (o->type != OSM_TYPE_WAY) { - // FIXME + printf("Linelabel request on object which is not way\n"); return; } - if (dbg_requests) - printf("[LAB] Labelling way %ju on %u\n", o->id, zindex); + if (dbg_requests >= VERBOSITY_PLACEMENT) + printf("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; @@ -375,7 +358,7 @@ 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) { - if (dbg_requests) + if (dbg_requests >= VERBOSITY_PLACEMENT) printf("Adding area on %u\n", zindex); struct request_area *r = GARY_PUSH(requests_area); @@ -398,7 +381,8 @@ void make_graph(void) hash_init(); struct mempool *mp_edges = mp_new(BLOCK_SIZE); - printf("Extracting nodes, will iterate over %lld ways\n", GARY_SIZE(buffer_line)); + if (dbg_graph >= VERBOSITY_GENERAL) + printf("Extracting nodes, will iterate over %lld ways\n", GARY_SIZE(buffer_line)); for (uns i=0; is.o; @@ -427,7 +411,7 @@ void make_graph(void) continue; } - struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge)); num_edges_dbg++; + struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge)); e->num = num_edges++; e->id = buffer_line[i].line->s.o->id; e->color = buffer_line[i].line->color; @@ -451,8 +435,6 @@ void make_graph(void) o_prev = o_node; } } - - printf("Made graph with %d edges\n", num_edges_dbg); } void dump_graph(void) @@ -469,11 +451,16 @@ void dump_graph(void) 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"); + { + // This shouldn't ever happen + printf("BEWARE! Edge is associated with a node it doesn't belongs to!\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)); + else if ((node->edges[i]->label)) printf("Labelled\n"); + printf(" colored %d;", node->edges[i]->color); printf(" length %.2f", node->edges[i]->length); printf("\n"); @@ -484,31 +471,31 @@ void dump_graph(void) void label_graph(void) { - if (dbg_graph) + if (dbg_graph >= VERBOSITY_GENERAL) printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel)); for (uns i=0; itype == SYMBOLIZER_TEXT) - if (dbg_graph) + if (dbg_graph >= VERBOSITY_INDIVIDUAL) 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) + if (dbg_graph >= VERBOSITY_PLACEMENT) printf("Looking for node %ju\n", ref->o->id); struct graph_node *n = hash_find(ref->o->id); if (n == NULL) { - // FIXME: What shall be done? + printf("BEWARE! Requested node couldn't be found.\n"); } else { - if (dbg_graph) + if (dbg_graph >= VERBOSITY_ALL) printf("Searching among %u edges\n", GARY_SIZE(n->edges)); for (uns j=0; jedges); j++) { if (n->edges[j]->id == buffer_linelabel[i].way->o.id) { - if (dbg_graph) + if (dbg_graph >= VERBOSITY_ALL) printf("Labelling node %ju\n", n->id); n->edges[j]->label = buffer_linelabel[i].label; n->edges[j]->zindex = buffer_linelabel[i].zindex; @@ -521,7 +508,7 @@ void label_graph(void) void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir) { - if (dbg_bfs) + if (dbg_bfs >= VERBOSITY_PLACEMENT) printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir); struct graph_edge *candidate = NULL; @@ -531,7 +518,7 @@ void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node * if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue; if ((uns) other->visited != e->longline) { - if (dbg_bfs) + if (dbg_bfs >= VERBOSITY_PLACEMENT) printf("Pushing new edge %d / %ju\n", other->num, other->id); struct graph_edge **e_ptr = GARY_PUSH(bfs_queue); *e_ptr = other; @@ -554,7 +541,7 @@ void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node * if (candidate) { - if (dbg_bfs) + if (dbg_bfs >= VERBOSITY_PLACEMENT) printf("New line in longline %u\n", e->longline); struct graph_edge *other = candidate; other->longline = e->longline; @@ -587,16 +574,17 @@ void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node * 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)); + if (dbg_bfs >= VERBOSITY_INDIVIDUAL) + { + printf("BFS called for longline %u\n", longline); + printf("%d longlines are believed to exist, %d exist\n", num_longlines, GARY_SIZE(longlines)); + } + for (uns i=0; i= VERBOSITY_PLACEMENT) printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue)); - //ASSERT(! cur->visited); cur->visited = longline; @@ -640,20 +628,24 @@ void bfs_wrapper(void) { GARY_PUSH(longlines); longlines[num_longlines].first = node->edges[i]; - if (dbg_bfs) + + if (dbg_bfs >= VERBOSITY_INDIVIDUAL) + { 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) + + if (dbg_bfs >= VERBOSITY_INDIVIDUAL) + { 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++; } } @@ -665,14 +657,14 @@ void bfs_wrapper(void) void dump_longlines(void) { -printf("*** Longlines dump\n"); + printf("*** Longlines dump\n"); for (uns i=0; ilabel) && (e->label->type == SYMBOLIZER_TEXT)) - printf(" labelled %s", osm_val_decode(((struct sym_text *) e->label)->text)); -printf("\n"); + if ((e->label) && (e->label->type == SYMBOLIZER_TEXT)) + printf(" labelled %s", osm_val_decode(((struct sym_text *) e->label)->text)); + printf("\n"); while (e) { @@ -724,23 +716,31 @@ struct request_segment *make_new_segment(struct request_section *rls, struct sym void cut_edge(struct graph_edge *e, double dist) { - if (dbg_segments) + if (dbg_segments >= VERBOSITY_PLACEMENT) 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? + switch (e->label->type) + { + case SYMBOLIZER_TEXT: + new->label = malloc(sizeof(struct sym_text)); + *((struct sym_text *) new->label) = *((struct sym_text *) e->label); + break; + default: + ; + } 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"); + if (dbg_segments >= VERBOSITY_PLACEMENT) + printf("Won't cut point\n"); return; } @@ -780,36 +780,39 @@ void make_segments(void) } else { - if (dbg_segments) + // FIXME: Should other label types be supported in future? + if (dbg_segments >= VERBOSITY_PLACEMENT) printf("Warning: Skipping line\n"); continue; - // FIXME; } - if (dbg_segments) + if (dbg_segments >= VERBOSITY_INDIVIDUAL) printf("New longline\n"); + while (e) { if (e->visited < 0) { - printf("BEWARE: Edge cycle\n"); + if (dbg_segments >= VERBOSITY_PLACEMENT) + printf("BEWARE: Edge cycle\n"); break; } - e->visited = -1; // FIXME + e->visited = -1; - if (dbg_segments) + if (dbg_segments >= VERBOSITY_PLACEMENT) 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"); + if (dbg_segments >= VERBOSITY_PLACEMENT) + printf("Warning: Skipping segment\n"); continue; } if (cur_length + e->length > conf_max_section_length + conf_max_section_overlay) { - if (dbg_segments) + if (dbg_segments >= VERBOSITY_PLACEMENT) 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)); @@ -830,7 +833,7 @@ void make_segments(void) cur_length += e->length; if (cur_length > conf_max_section_length) { - if (dbg_segments) + if (dbg_segments >= VERBOSITY_PLACEMENT) 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); @@ -842,8 +845,8 @@ void make_segments(void) if (request->sections[0].num_segments == 0) { - // FIXME - printf("WARNING: 0 segment section\n"); + if (dbg_segments >= VERBOSITY_INDIVIDUAL) + printf("WARNING: Longline without any segment, skipped\n"); GARY_POP(requests_line); num_requests -= 2; } @@ -856,11 +859,13 @@ void dump_linelabel_requests(void) { if (requests_line[i].sections[0].num_segments == 0) { - printf("HEY!\n"); + if (dbg_segments >= VERBOSITY_INDIVIDUAL) + printf("Beware: Longline without any segment\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); + dump_label(requests_line[i].sections[0].segments[0].label); for (uns j=0; jplacements); i++) { if (individual->placements[i].variant_used == -1) continue; @@ -905,12 +911,14 @@ void dump_bitmaps(struct individual *individual) { for (int col = max2(p->x, 0); col < min2(p->x + v->width, page_width_int); col++) { + if (bitmap[row * page_width_int + col] == 1) total += 1; bitmap[row * page_width_int + col] = 1; } } } + if (dbg_overlaps >= VERBOSITY_GENERAL) + printf("There were %d collisions during bitmap dump\n", total); - 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); @@ -927,8 +935,9 @@ void dump_bitmaps(struct individual *individual) void dump_individual(struct individual *individual) { -printf("*** Dumping INDIVIDUAL ***\n"); -printf("(There are %d requests)\n", num_requests); + printf("*** Individual dump\n"); + printf("(There are %d requests)\n", num_requests); + for (uns i=0; iplacements); i++) { struct placement *p = &(individual->placements[i]); @@ -941,7 +950,7 @@ printf("(There are %d requests)\n", num_requests); case REQUEST_LINE: ; struct request_line *rl = (struct request_line *) p->request; printf("Line: "); - print_label(rl->sections[0].segments[0].label); + dump_label(rl->sections[0].segments[0].label); break; case REQUEST_SECTION: ; printf("*"); @@ -955,11 +964,10 @@ printf("(There are %d requests)\n", num_requests); case REQUEST_AREA: ; struct request_area *ra = (struct request_area *) p->request; printf("Area label "); - print_label(ra->label); + dump_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); } } @@ -997,8 +1005,8 @@ void plan_individual(struct individual *individual) continue; } -if (dbg_plan) - printf("Will plan symbol at [%.2f; %.2f] on %u\n", individual->placements[i].x, individual->placements[i].y, zindex); + if (dbg_plan >= VERBOSITY_PLACEMENT) + printf("Will plan symbol at [%.2f; %.2f] on %u\n", individual->placements[i].x, individual->placements[i].y, zindex); if (s) switch (s->type) { @@ -1019,7 +1027,8 @@ if (dbg_plan) 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); + if (dbg_plan >= VERBOSITY_PLACEMENT) + 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: @@ -1036,28 +1045,18 @@ void dump_penalties(struct individual **population) } } -void labeller_label(void) +void compute_sizes(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); + 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; breed_pop_size = conf_breed_pop_size * conf_pop_size; breed_rbest_size = conf_breed_rbest * conf_pop_size; - if (dbg_evolution) + if (dbg_evolution >= VERBOSITY_GENERAL) { printf("Breeding parameters:\n"); printf(" %d individuals are created\n", breed_pop_size); @@ -1066,7 +1065,7 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY mutate_pop_size = conf_mutate_pop_size * conf_pop_size; mutate_rbest_size = conf_mutate_rbest * conf_pop_size; - if (dbg_evolution) + if (dbg_evolution >= VERBOSITY_GENERAL) { printf("Mutation parameters:\n"); printf(" %d individuals are created\n", mutate_pop_size); @@ -1074,17 +1073,44 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY } elite_pop_size = conf_elite_pop_size * conf_pop_size; - if (dbg_evolution) + if (dbg_evolution >= VERBOSITY_GENERAL) { printf("Elitism parameters:\n"); printf(" %d best individuals are copied\n", elite_pop_size); } + if (breed_pop_size + mutate_pop_size + elite_pop_size != conf_pop_size) + { + fprintf(stderr, "Breeding + mutation + elitism won't create correct number of individuals\n"); + fprintf(stderr, "Please fix conf_breed_pop_size, conf_mutate_pop_size and conf_elite_pop_size parameters\n"); + exit(2); + } +} + +void labeller_label(void) +{ + make_graph(); + label_graph(); + bfs_wrapper(); + make_segments(); + + 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 >= VERBOSITY_GENERAL) + { + printf("Penalties after initialization\n"); + dump_penalties(population1); + } + while (! shall_terminate()) { iteration++; if (dbg_evolution) - printf("*** Iteration %d ***\n", iteration); + printf("\n*** Iteration %d ***\n", iteration); breed(); mutate(); @@ -1095,16 +1121,24 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY population2 = swp; pop2_ind = 0; - if (dbg_evolution) - dump_penalties(population1); - rank_population(); + + if (dbg_evolution >= VERBOSITY_GENERAL) + printf("Sorting population\n"); qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual); - if (dbg_evolution) + if (dbg_evolution >= VERBOSITY_GENERAL) + { + printf("Penalties after sort\n"); dump_penalties(population1); + } + + old_best = population1[0]->penalty; } + if (dbg_overlaps >= VERBOSITY_GENERAL) + dump_bitmaps(population1[0]); + plan_individual(population1[0]); labeller_cleanup(); @@ -1114,6 +1148,10 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY void labeller_cleanup(void) { + hash_cleanup(); + GARY_FREE(requests_point); + GARY_FREE(requests_line); + GARY_FREE(requests_area); } void make_population(void) @@ -1125,7 +1163,7 @@ void make_population(void) init_individual(i2); population2[i] = i2; - if (dbg_init) + if (dbg_init >= VERBOSITY_INDIVIDUAL) printf("Making individual %d\n", i); struct individual *individual = ep_alloc(ep_individuals); init_individual(individual); population1[i] = individual; @@ -1173,7 +1211,7 @@ bool shall_terminate(void) case TERM_COND_ITERATIONS: return (iteration >= conf_iteration_limit); default: - // FIXME: Warn the user that no condition is set + fprintf(stderr, "Warning: No termination condition is set, terminating\n"); return 1; } } @@ -1185,8 +1223,8 @@ void breed(void) struct individual **breed_buffer; while (i < breed_pop_size) { - int parent1 = randint(0, breed_rbest_size-1); - int parent2 = randint(0, breed_rbest_size-1); + int parent1 = randint(0, breed_rbest_size); + int parent2 = randint(0, breed_rbest_size); if (dbg_breeding >= VERBOSITY_INDIVIDUAL) printf("Will breed %d and %d\n", parent1, parent2); @@ -1255,13 +1293,13 @@ void mutate(void) { for (int i=0; i < mutate_pop_size; i++) { - if (dbg_mutation) - printf("%d\n", i); + if (dbg_mutation >= VERBOSITY_INDIVIDUAL) + printf("Creating %d-th individual by mutation\n", i); int ind = randint(1, mutate_rbest_size); - if (dbg_mutation) + if (dbg_mutation >= VERBOSITY_INDIVIDUAL) printf("Mutating %d-th individual of original population\n", ind); copy_individual(population1[ind], population2[pop2_ind]); - if (dbg_mutation) + if (dbg_mutation >= VERBOSITY_INDIVIDUAL) printf("Individual %d in pop2 inited from individual %d in pop1\n", pop2_ind, ind); perform_mutation(population2[pop2_ind]); pop2_ind++; @@ -1277,7 +1315,7 @@ void perform_mutation(struct individual *individual) if (x <= acc + conf_mutate_move_bound) { - if (dbg_mutation) + if (dbg_mutation >= VERBOSITY_PLACEMENT) printf("Mutation: Moving symbol in placement %u\n", i); move_symbol(&(individual->placements[i])); continue; @@ -1310,6 +1348,8 @@ void perform_mutation(struct individual *individual) } } } + + hide_segment_labels(individual); } void elite(void) @@ -1340,6 +1380,7 @@ int overlaps(struct placement *p1, struct placement *p2) v1 = &(p1->request->variants[p1->variant_used]); v2 = &(p2->request->variants[p2->variant_used]); + // FIXME: This doesn't fully respect offset which it probably should int p1x = p1->x; int p1y = p1->y; int p2x = p2->x; int p2y = p2->y; @@ -1360,7 +1401,7 @@ int get_overlap(struct placement *p) struct map_part **parts = get_map_parts(p); if (! parts) { - if (dbg_overlaps) + if (dbg_overlaps >= VERBOSITY_PLACEMENT) printf("Placement of request %d seems not to be placed\n", p->request->ind); return 0; } @@ -1397,6 +1438,9 @@ int get_overlap(struct placement *p) GARY_FREE(parts); GARY_FREE(others); + if (dbg_overlaps >= VERBOSITY_PLACEMENT) + printf("Placement of request %d add %d to overlaps\n", p->request->ind, overlap); + return overlap; } @@ -1471,17 +1515,17 @@ void rank_population(void) for (int i=0; i= VERBOSITY_INDIVIDUAL) printf("Individual %d\n", i); population1[i]->penalty = 0; penalty = individual_overlap(population1[i]); - if (dbg_rank) + if (dbg_rank >= VERBOSITY_INDIVIDUAL) printf("Increasing penalty by %d for overlap\n", penalty); population1[i]->penalty += penalty; penalty = individual_distances(population1[i]); - if (dbg_rank) + if (dbg_rank >= VERBOSITY_INDIVIDUAL) printf("Increasing penalty by %d for distances\n", penalty); population1[i]->penalty += penalty; } @@ -1494,7 +1538,7 @@ struct map_part **get_map_parts(struct placement *p) struct map_part **buffer; GARY_INIT(buffer, 0); - if (dbg_map_parts) + if (dbg_map_parts >= VERBOSITY_PLACEMENT) 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; @@ -1506,9 +1550,14 @@ struct map_part **get_map_parts(struct placement *p) v = p->request->variants[p->variant_used]; break; default: + if (dbg_map_parts >= VERBOSITY_ALL) + printf("Skipping unsupported request type (%d)\n", p->request->type); return NULL; } + if (dbg_map_parts >= VERBOSITY_PLACEMENT) + printf("Bitmap is %d x %d\n", v.width, v.height); + int x_min = max2(0, p->x) / conf_map_part_width; // CHECK ME: Is rounding needed? int x_max = min2(page_width_int, (p->x + v.width)) / conf_map_part_width; @@ -1516,18 +1565,21 @@ struct map_part **get_map_parts(struct placement *p) // CHECK ME: Is rounding needed? int y_max = min2(page_height_int, (p->y + v.height)) / conf_map_part_height; - if (dbg_map_parts) + if (dbg_map_parts >= VERBOSITY_PLACEMENT) 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) + if (dbg_map_parts >= VERBOSITY_ALL) 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]; } + if (dbg_map_parts >= VERBOSITY_PLACEMENT) + printf("Returning %u map parts potentially containing the symbol\n", GARY_SIZE(buffer)); + return buffer; } @@ -1589,7 +1641,7 @@ void gen_coords(struct placement *p) printf("Not yet implemented\n"); break; default: - if (dbg_movement) + if (dbg_movement >= VERBOSITY_ALL) printf("Testing request type\n"); ASSERT(p->request->type != REQUEST_INVALID); } @@ -1601,7 +1653,7 @@ double gen_movement(void) { double m = (random() % 100000) / 10000; m = pow(m, 1.0/3) * flip(1, -1); - if (dbg_movement) + if (dbg_movement >= VERBOSITY_ALL) printf("Movement %.2f\n", m); return m; } @@ -1631,36 +1683,15 @@ void gen_coords_area(struct placement *p) p->x = p->x + gen_movement(); p->y = p->y + gen_movement(); - if (dbg_movement) + if (dbg_movement >= VERBOSITY_PLACEMENT) 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) -{ - struct map_part **buffer; - GARY_INIT(buffer, 0); - int x_min = symbol->x / conf_part_size; - int x_max = (symbol->x /*+ symbol->bitmap->width*/ + conf_part_size - 1) / conf_part_size; - int y_min = symbol->y / conf_part_size; - int y_max = (symbol->y /*+ symbol->bitmap->height*/ + conf_part_size - 1) / conf_part_size; - - for (int x=x_min; x < x_max; x++) - for (int y=y_min; y < y_max; y++) - { - struct map_part *m = GARY_PUSH(buffer); - *m = individual->map[x][y]; - } - - return buffer; -} - 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)); - return (r * (max - min)); } struct placement **get_closure(struct placement *placement) @@ -1781,7 +1812,6 @@ void hide_segment_labels(struct individual *individual) void init_placement(struct placement *p, struct individual *individual, struct request *r) { - // FIXME p->ind = num_placements++; p->request = r; p->processed = 0; @@ -1815,17 +1845,17 @@ void init_placement(struct placement *p, struct individual *individual, struct r break; default: ASSERT(p->request->type != REQUEST_INVALID); - printf("Valid request: %d\n", p->request->type); } gen_coords(p); - if (dbg_init) + if (dbg_init >= VERBOSITY_PLACEMENT) printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y); } void init_individual(struct individual *i) { -//printf("Initing individual\n"); + if (dbg_init >= VERBOSITY_INDIVIDUAL) + printf("Initing individual\n"); GARY_INIT(i->placements, num_requests); GARY_INIT(i->map, 0); for (uns j=0; jpenalty = 0; // FIXME - if (dbg_init) + if (dbg_init >= VERBOSITY_INDIVIDUAL) printf("Individual inited, has %u map parts\n", GARY_SIZE(i->map)); } @@ -1865,7 +1895,7 @@ struct placement **get_overlapping(struct placement *p) } GARY_FREE(parts); - if (dbg_map_parts) + if (dbg_map_parts >= VERBOSITY_PLACEMENT) printf("Returning %u potentially overlapping placements\n", GARY_SIZE(buffer)); return buffer; @@ -1899,14 +1929,6 @@ double randdouble(void) return ((double) rand() / (double) RAND_MAX); } -void cleanup(void) -{ - hash_cleanup(); - GARY_FREE(requests_point); - GARY_FREE(requests_line); - GARY_FREE(requests_area); -} - void copy_individual(struct individual *src, struct individual *dest) { dest->penalty = src->penalty; diff --git a/sym-point.c b/sym-point.c index b738c86..9c159bf 100644 --- a/sym-point.c +++ b/sym-point.c @@ -134,8 +134,6 @@ static void sym_icon_gen(struct osm_object *o, struct style_info *si, struct svg if (!osm_obj_center(o, &sir->x, &sir->y)) return; - printf("Right now, coords are [%.2f; %.2f]\n", sir->x, sir->y); - sir->width = icon->width; sir->height = icon->height; style_scale(si, &sir->width, &sir->height, PROP_ICON_WIDTH, PROP_ICON_HEIGHT); @@ -144,29 +142,21 @@ static void sym_icon_gen(struct osm_object *o, struct style_info *si, struct svg // sir->opacity = 1; // style_get_number(si, PROP_ICON_OPACITY, &sir->opacity); - printf("Planning icon to [%.2f; %.2f]\n", sir->x, sir->y); switch (o->type) { case OSM_TYPE_NODE: - printf("it's node\n"); labeller_add_point(&sic->s, o, sym_zindex(o, si, 4)); break; case OSM_TYPE_WAY: if (!osm_way_cyclic_p((struct osm_way *) o)) { - printf("it's way\n"); - // CHECK ME - printf("[SP] Labelling way %ju with something\n", o->id); labeller_add_linelabel(&sic->s, o, sym_zindex(o, si, 4)); break; } case OSM_TYPE_MULTIPOLYGON: - printf("it's multipolygon\n"); labeller_add_arealabel(&sic->s, o, sym_zindex(o, si, 4)); break; } - //labeller_add_point(&sic->s, o, sym_zindex(o, si, 4)); - //sym_plan(&sic->s, sym_zindex(o, si, 4)); } struct symbolizer symbolizer_icon = { diff --git a/sym-text.c b/sym-text.c index 6622fd6..96b3a50 100644 --- a/sym-text.c +++ b/sym-text.c @@ -228,7 +228,6 @@ static void prepare_text_element(struct sym_text *t, struct svg *svg) static void sym_text_draw(struct symbol *sym, struct svg *svg) { struct sym_text *t = (struct sym_text *) sym; -printf("Drawing %s at [%.2f; %.2f]\n", osm_val_decode(t->text), t->x, t->y); if (t->next_duplicate) { @@ -467,14 +466,10 @@ static void sym_text_center(struct osm_object *o, struct style_info *si, osm_val text_fix_placement(st); if (o->type == OSM_TYPE_WAY && !osm_way_cyclic_p((struct osm_way *) o)) { - //sym_plan(&st->s, sym_zindex(o, si, 4.9)); - printf("[Sym] Labelling way %ju with %s\n", o->id, osm_val_decode(st->text)); labeller_add_linelabel(&st->s, o, sym_zindex(o, si, 4.9)); } else { - //sym_plan(&st->s, sym_zindex(o, si, 4.9)); - printf("[Sym] Labelling area %ju with %s\n", o->id, osm_val_decode(st->text)); labeller_add_arealabel(&st->s, o, sym_zindex(o, si, 4.9)); } } -- 2.39.2