X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=labeller.c;h=0942f073d826788166d232f13ae4842e19176e5e;hb=21017820e79722500c429cabda7f7c3a74259cd1;hp=7f74bbf8efb6f579705999b3d9af4a56c84b1699;hpb=27a0c4be8375ad51adf0a55696f83859625b8d47;p=leo.git diff --git a/labeller.c b/labeller.c index 7f74bbf..0942f07 100644 --- a/labeller.c +++ b/labeller.c @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -5,6 +7,7 @@ #include "leo.h" #include "sym.h" +#include "map.h" #include "labeller.h" #define HASH_NODE struct graph_node @@ -12,11 +15,13 @@ #define HASH_KEY_ATOMIC id #define HASH_WANT_FIND #define HASH_WANT_NEW +#define HASH_WANT_CLEANUP #include #include #include #include +#include #define BLOCK_SIZE 4096 @@ -26,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; @@ -36,17 +41,28 @@ struct eltpool *ep_individuals; struct individual **population1; struct individual **population2; +int dbg_segments = 0; +int dbg_plan = 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; int conf_stagnation_bound = 0; -int conf_iteration_limit = 5; +int conf_iteration_limit = 4; 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; +int conf_breed_perc = 50; // Percentage of new pop created by breeding bool conf_mutate_children = 1; int conf_mutate_children_prob = 0.3; @@ -60,6 +76,9 @@ int conf_mutate_chvar_bound = 0.1; 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; int pop2_ind; @@ -69,20 +88,153 @@ int conf_part_size = 50; int move_min = 0; 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 plan_individual(struct individual *individual); + +void make_bitmap(struct point_variant *v, struct symbol *sym); +void make_bitmap_icon(struct point_variant *v, struct sym_icon *si); +void make_bitmap_point(struct point_variant *v, struct sym_point *sp); +void make_bitmap_label(struct point_variant *v, struct sym_text *text); + +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); + +double gen_movement(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); + +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); + +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); + +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); +} + +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; v->height = si->sir.icon->height; + v->bitmap = malloc((int) ceil(v->width * v->height * sizeof(bool))); + for (int i=0; iwidth*v->height; i++) v->bitmap[i] = 1; } void make_bitmap_point(struct point_variant *v, struct sym_point *sp) @@ -93,30 +245,35 @@ void make_bitmap_point(struct point_variant *v, struct sym_point *sp) for (int i=0; isize*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 point_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; iheight; i++) + for (int j=0; jwidth; 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? +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); + + r->request.type = REQUEST_POINT; + 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; @@ -125,37 +282,84 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t struct point_variant *v = GARY_PUSH(r->variants); - if (sym->type == SYMBOLIZER_ICON) + struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning + r->x = n->x; + r->y = n->y; switch (sym->type) { case SYMBOLIZER_ICON: make_bitmap_icon(v, (struct sym_icon *) sym); + r->x = ((struct sym_icon *)sym)->sir.x; + r->y = ((struct sym_icon *)sym)->sir.y; break; case SYMBOLIZER_POINT: make_bitmap_point(v, (struct sym_point *) sym); break; + case SYMBOLIZER_TEXT: ; + struct sym_text *st = (struct sym_text *) sym; + struct osm_node *n = (struct osm_node *) object; + make_bitmap_label(v, st); default: - // Oops :) // FIXME return; } - sym_plan(sym, zindex); // TEMPORARY +// 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) { +printf("Adding line on %u\n", zindex); struct buffer_line *b = GARY_PUSH(buffer_line); b->line = (struct sym_line *) sym; b->zindex = zindex; sym_plan(sym, zindex); } -void labeller_add_arealabel(struct symbol *sym UNUSED, struct osm_object *o, 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; + } + + printf("[LAB] Labelling way %ju on %u\n", o->id, zindex); + struct buffer_linelabel *ll = GARY_PUSH(buffer_linelabel); + ll->way = (struct osm_way *) o; + ll->label = sym; + ll->zindex = zindex; +} + +void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex) { +printf("Adding area on %u\n", zindex); struct request_area *r = GARY_PUSH(requests_area); + + r->request.type = REQUEST_AREA; + r->request.ind = num_requests++; + r->o = (struct osm_multipolygon *) o; r->zindex = zindex; + r->label = sym; + + osm_obj_center(o, &(r->cx), &(r->cy)); + + GARY_INIT(r->variants, 0); + struct point_variant *v = GARY_PUSH(r->variants); + switch (sym->type) + { + case SYMBOLIZER_ICON: + printf("DEBUG: Icon label\n"); + make_bitmap_icon(v, (struct sym_icon *) sym); + break; + case SYMBOLIZER_TEXT: + printf("DEBUG: Text label\n"); + make_bitmap_label(v, (struct sym_text *) sym); + default: + // FIXME + ; + } } void make_graph(void) @@ -167,54 +371,96 @@ void make_graph(void) for (uns i=0; is.o; - struct graph_node *prev = NULL; - struct osm_node *prev_node = NULL; + struct graph_node *g_prev = NULL; + struct osm_node *o_prev = NULL; + CLIST_FOR_EACH(struct osm_ref *, ref, way->nodes) { // FIXME: Shall osm_object's type be checked here? - struct osm_node *node = (struct osm_node *) ref->o; + struct osm_node *o_node = (struct osm_node *) ref->o; - struct graph_node *n = hash_find(ref->o->id); - if (!n) + struct graph_node *g_node = hash_find(ref->o->id); + if (!g_node) { - n = hash_new(ref->o->id); - GARY_INIT(n->edges, 0); + 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 (! prev) + if (! g_prev) { - prev = n; - prev_node = node; + g_prev = g_node; + o_prev = o_node; continue; } - struct graph_edge *e = (struct graph_edge *) 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(prev_node->x - node->x), abs(prev_node->y - node->y)); - e->visited = 0; + e->length = hypot(abs(o_prev->x - o_node->x), abs(o_prev->y - o_node->y)); + e->visited = -1; e->prev = NULL; e->next = NULL; - e->n1 = prev; - e->n2 = n; - e->longline = -1; - e->text = NULL; - e->sym = buffer_line[i].line; - - struct graph_edge **edge = GARY_PUSH(prev->edges); + e->n1 = g_prev; + e->n2 = g_node; + e->longline = (uns) -1; + 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(n->edges); + 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; iedges); 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) { +printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel)); for (uns i=0; itype == SYMBOLIZER_TEXT) + printf("Labelling nodes of way %s\n", osm_val_decode(((struct sym_text *) buffer_linelabel[i].label)->text)); CLIST_FOR_EACH(struct osm_ref *, ref, buffer_linelabel[i].way->nodes) { + printf("Looking for node %ju\n", ref->o->id); struct graph_node *n = hash_find(ref->o->id); if (n == NULL) { @@ -222,11 +468,14 @@ void label_graph(void) } else { + printf("Searching among %u edges\n", GARY_SIZE(n->edges)); for (uns j=0; jedges); j++) { - if (n->edges[j]->id == ((struct osm_object *) buffer_linelabel[i].way)->id) + if (n->edges[j]->id == buffer_linelabel[i].way->o.id) { - n->edges[j]->text = buffer_linelabel[i].text; + printf("Labelling node %ju\n", n->id); + n->edges[j]->label = buffer_linelabel[i].label; + n->edges[j]->zindex = buffer_linelabel[i].zindex; } } } @@ -234,85 +483,112 @@ 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? - } - +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; iedges); i++) + + for (uns i=0; iedges); i++) { - struct graph_edge *other = other_node->edges[i]; - if (! other->visited) - { - printf("Trying to add %dth edge\n", GARY_SIZE(bfs_queue)+1); - struct graph_edge **new = GARY_PUSH(bfs_queue); - *new = other_node->edges[i]; + struct graph_edge *other = node->edges[i]; +if (e->num == 987) printf("Got label %d\n", e->num); + if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue; +if (e->num == 987) printf("Continuing with edge %d\n", e->num); + +printf("Testing %d ?= %d\n", other->visited, e->longline); + if ((uns) other->visited != e->longline) { + printf("Pushing new edge %d / %ju\n", other->num, other->id); + struct graph_edge **e_ptr = GARY_PUSH(bfs_queue); + *e_ptr = other; + other->visited = e->longline; } - //if (1) // FIXME: same labels but not the same edge - 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) +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))) { - candidate->n1 = candidate->n2; - candidate->n2 = e->n1; + struct graph_node *swp = other->n2; + other->n2 = other->n1; + other->n1 = swp; } - e->prev = candidate; - candidate->next = e; - longlines[e->longline].first = candidate; + switch (dir) + { + 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); + } + } +} + +void bfs(uns longline) +{ +printf("BFS called for longline %u\n", longline); +printf("%d longlines are believed to exist, %d exist\n", num_longlines, GARY_SIZE(longlines)); + for (uns i=0; inum, GARY_SIZE(bfs_queue)); + //ASSERT(! cur->visited); + + cur->visited = longline; + + if (cur->longline == (uns) -1) + continue; + + 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 labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex) -{ - struct buffer_linelabel *ll = GARY_PUSH(buffer_linelabel); - ll->way = (struct osm_way *) o; - ll->text = (struct sym_text *) sym; - ll->zindex = zindex; -} - -void bfs(void) +void bfs_wrapper(void) { GARY_INIT(bfs_queue, 0); GARY_INIT(longlines, 0); @@ -321,25 +597,21 @@ void bfs(void) { for (uns i=0; iedges); i++) { - struct graph_edge *e = node->edges[i]; - - if (e->visited) HASH_CONTINUE; - if (e->longline == (uns) -1) + if ((node->edges[i]->label) && (node->edges[i]->longline == (uns) -1)) { GARY_PUSH(longlines); - e->longline = num_longlines++; - longlines[num_longlines].first = e; - } - - e->visited = 1; - - if (! e->prev) - { - join_edge(e, 1); - } - if (! e->next) - { - join_edge(e, 2); + longlines[num_longlines].first = node->edges[i]; + printf("Running new BFS\n"); + printf("Creating longline %u\n", num_longlines); + GARY_RESIZE(bfs_queue, 0); + struct graph_edge **e = GARY_PUSH(bfs_queue); + *e = node->edges[i]; + node->edges[i]->longline = num_longlines; + bfs(node->edges[i]->longline); + //dump_longlines(); + printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0; + printf("Planned %u edges\n", GARY_SIZE(bfs_queue)); + num_longlines++; } } } @@ -348,79 +620,466 @@ void bfs(void) GARY_FREE(bfs_queue); } -void make_segments(void) +void dump_longlines(void) { - GARY_INIT(requests_line, 0); +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"); + + 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); + + 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 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; + + 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; + } + + 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; + + 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)); +} + +void make_segments(void) +{ for (uns i=0; isegments, 0); + // 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; + + struct sym_text *st = NULL; + if (e->label->type == SYMBOLIZER_TEXT) + { + st = (struct sym_text *) e->label; + } + else + { + printf("Warning: Skipping line\n"); + continue; + // FIXME; + } + + printf("New longline\n"); while (e) { - struct request_segment *r = GARY_PUSH(request->segments); - request->num_segments++; - r->x1 = ((struct osm_node *) e->n1)->x; - r->y1 = ((struct osm_node *) e->n1)->y; - r->x2 = ((struct osm_node *) e->n2)->x; - r->y2 = ((struct osm_node *) e->n2)->y; - r->sym = e->sym; - r->k = abs(r->x2 - r->x1) / abs(r->y2 - r->y1); - r->variant = malloc(sizeof(struct point_variant)); // FIXME - make_bitmap_label(r->variant, e->text); + 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); + cut_edge(e, conf_max_section_length - cur_length); + } + + if (cur_length + e->length > conf_max_section_length) + { + if (dbg_segments) + printf("Making new section, new length would be %f, allowed is %.2f / %.2f\n", cur_length + e->length, conf_max_section_length, conf_max_section_overlay); + + struct osm_node *n1 = e->n1->o; + struct osm_node *n2 = e->n2->o; + rs = make_new_segment(rls, e->label); + rs->x1 = n1->x; + rs->y1 = n1->y; + rs->x2 = n2->x; + rs->y2 = n2->y; + rs->zindex = e->zindex; + + rs->label = malloc(sizeof(struct sym_text)); + *((struct sym_text *) rs->label) = *((struct sym_text *) e->label); + rls = make_new_section(request); + cur_length = 0; + } + + if (st && (e->length < st->tw)) + { + e = e->next; + printf("Warning: Skipping segment\n"); + continue; + } + + 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; + rs->x2 = e->n2->o->x; + rs->y2 = e->n2->o->y; + + // FIXME: Set text rotation + rs->angle = atan2(rs->x2 - rs->x1, rs->y2 - rs->y1); + rs->zindex = e->zindex; + + cur_length += e->length; 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 dump_linelabel_requests(void) +{ + for (uns i=0; ix1, rs->y1, rs->x2, rs->y2); + } + } + printf("\n"); + } +} + +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; iplacements); i++) + { +fprintf(stderr, "%d-th placement\n", i); + struct placement *p = &(individual->placements[i]); + struct point_variant *v = NULL; + + switch (p->request->type) + { + case REQUEST_SEGMENT: ; + struct request_segment *rs = (struct request_segment *) p->request; + v = rs->variant; + break; + case REQUEST_POINT: ; + struct request_point *rp = (struct request_point *) p->request; + v = &(rp->variants[p->variant_used]); + break; + case REQUEST_AREA: ; + struct request_area *ra = (struct request_area *) p->request; + printf("Using %d-th of %d variants\n", p->variant_used, GARY_SIZE(ra->variants)); + v = &(ra->variants[p->variant_used]); + break; + default: + printf("Testing request type (dump_bitmaps): %d\n", p->request->type); + ASSERT(p->request->type != REQUEST_INVALID); + continue; + } + + printf("Got after with %d-th placement of request type %d\n", i, p->request->type); + + printf("Rendering %d-th label %d x %d (w x h)\n", i, v->width, v->height); + for (int row = max2(p->y, 0); row < min2(p->y + v->height, page_height_int); row++) + { + for (int col = max2(p->x, 0); col < min2(p->x + v->width, page_width_int); col++) + { + printf("Writing to %d\n", row*page_width_int + col); + bitmap[row * page_width_int + col] = 1; + } + } + } + + 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; iplacements); 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); +} + +void plan_individual(struct individual *individual) +{ + for (uns i=0; iplacements); i++) + { + 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 *) 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_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; + } + +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); + } + } + +} + void labeller_label(void) { make_graph(); label_graph(); - bfs(); +//dump_graph(); + bfs_wrapper(); +//dump_longlines(); make_segments(); +dump_linelabel_requests(); + +printf("Having %u point requests, %u line requests and %u area requests\n", GARY_SIZE(requests_point), GARY_SIZE(requests_line), GARY_SIZE(requests_area)); + GARY_INIT(population1, conf_pop_size); + GARY_INIT(population2, conf_pop_size); make_population(); + printf("Dealing with %d requests\n", num_requests); + +/* while (! shall_terminate()) { - // sort population by fitness - // alloc new population - breed(); - mutate(); - elite(); - rank_population(); + iteration++; + + struct individual **swp = population1; + population1 = population2; + population2 = swp; + pop2_ind = 0; } +*/ + + dump_individual(population1[0]); +//dump_bitmaps(population1[0]); + + plan_individual(population1[0]); + + labeller_cleanup(); + + return; +} + +void labeller_cleanup(void) +{ } void make_population(void) { - GARY_INIT(population1, 0); for (int i=0; imap, 0); - GARY_INIT(individual->placements, 0); + 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; jplacements); - init_placement(p, (struct request *) &requests_point[i]); + init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_point[j]); } + for (uns j=0; jplacements); - init_placement(p, (struct request *) &requests_line[i]); + init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_line[j]); + + for (uns k=0; kplacements[p++]), individual, (struct request *) &requests_line[j].sections[k]); + + for (uns l=0; lplacements[p++]), individual, (struct request *) &requests_line[j].sections[k].segments[l]); + } + } } + for (uns j=0; jplacements); - init_placement(p, (struct request *) &requests_area[i]); + init_placement(&(individual->placements[p++]), individual, (struct request *) &requests_area[j]); } + + hide_segment_labels(individual); + +if (p != num_requests) +{ + printf("Say bye\n"); + exit(42); +} + +printf("Testing p\n"); + ASSERT(p == num_requests); } } @@ -444,27 +1103,34 @@ void breed(void) { int acc = 0; int i=0; - int conf_breed_pop_size = conf_breed_pop_size_perc * conf_pop_size; + printf("%.2f\n", ((double) conf_breed_pop_size_perc/100)); + int conf_breed_pop_size = ((double) conf_breed_pop_size_perc/100) * conf_pop_size; struct individual **breed_buffer; - while (i < conf_breed_rbest_perc * conf_pop_size) + while (i < conf_breed_pop_size) { + printf("%d < %d, breeding\n", i, conf_breed_pop_size); int parent1 = randint(1, conf_breed_pop_size); int parent2 = randint(1, conf_breed_pop_size); + printf("Will breed %d and %d, chosen of %d best of %d population (intended to be %d)\n", parent1, parent2, conf_breed_pop_size, GARY_SIZE(population1), conf_pop_size); breed_buffer = perform_crossover(population1[parent1], population1[parent2]); - population2[2*i] = breed_buffer[0]; - population2[2*i+1] = breed_buffer[1]; + population2[pop2_ind++] = breed_buffer[0]; + population2[pop2_ind++] = breed_buffer[1]; free(breed_buffer); + i++; } acc += conf_breed_rbest_perc; + return; // FIXME: DEBUG HACK + int remaining = (1 - acc) * (conf_pop_size * conf_breed_perc); int step = remaining / conf_pop_size; for (; iplacements); i++) { + printf("%dth placement out of %d\n", i, num_requests); if (! parent1->placements[i].processed) { - struct placement **clos_symbols; - GARY_INIT(clos_symbols, 0); - get_closure(clos_symbols, &(parent1->placements[i]), parent1, parent2); + struct placement **clos_symbols = get_closure(&(parent1->placements[i]), parent1, parent2); int x = randint(1, 2); if (x == 1) @@ -495,6 +1162,7 @@ struct individual **perform_crossover(struct individual *parent1, struct individ copy_symbols(clos_symbols, parent2, child1); copy_symbols(clos_symbols, parent1, child2); } + printf("Symbols copied; %lld\n", GARY_SIZE(clos_symbols)); GARY_FREE(clos_symbols); } @@ -517,8 +1185,9 @@ void mutate(void) while (i < conf_mutate_rbest_perc * conf_pop_size) { int ind = randint(1, conf_mutate_pop_size); - population2[pop2_ind] = population1[ind]; + copy_individual(population2[pop2_ind], population1[ind]); perform_mutation(population2[pop2_ind]); + pop2_ind++; } } @@ -557,7 +1226,7 @@ void elite(void) { for (int i=0; irequest->type != REQUEST_INVALID); } } -void gen_coords_point(struct placement *p UNUSED) +double gen_movement(void) { - // FIXME + double m = (random() % 1000000) / 10000; + m = pow(m, 1.0/3) * flip(1, -1); + printf("Movement %.2f\n", m); + return m; +} + +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(); + + 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) @@ -601,12 +1309,18 @@ 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)); return (r * (max - min)); } -void get_closure(struct placement **closure UNUSED, struct placement *placement UNUSED, struct individual *parent1 UNUSED, struct individual *parent2 UNUSED) +struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2 UNUSED) { + printf("Getting closure\n"); + struct placement **closure; + GARY_INIT(closure, 0); bool *chosen = malloc(GARY_SIZE(parent1->placements) * sizeof(bool)); chosen[placement->request->ind] = 1; @@ -615,6 +1329,7 @@ void get_closure(struct placement **closure UNUSED, struct placement *placement uns first = 0; while (first < GARY_SIZE(closure)) { + printf("Iterating, first is %d\n", first); struct placement **overlapping = get_overlapping(placement); filter(overlapping, chosen); for (uns j=0; jrequest->ind] = 1; } GARY_FREE(overlapping); + first++; } + + return closure; } void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child) { + //printf("%d\n", child->penalty); + //printf("Closure size: %lld\n", GARY_SIZE(closure)); for (uns i=0; irequest->ind; child->placements[ind] = parent->placements[ind]; + child->placements[ind].processed = 0; } } @@ -641,6 +1362,12 @@ void move_symbol(struct placement *p) { case REQUEST_POINT: move_symbol_point(p); + case REQUEST_LINE: + case REQUEST_SEGMENT: + case REQUEST_AREA: + printf("Not yet implemented\n"); + default: + ASSERT(p->request->type != REQUEST_INVALID); } } @@ -650,16 +1377,87 @@ void move_symbol_point(struct placement *p) p->y += (double) (move_min + randdouble()) * flip(1, -1); } -void init_placement(struct placement *p UNUSED, struct request *r UNUSED) +void hide_segment_labels(struct individual *individual) +{ + // BEWARE: This fully depends on current genetic encoding + + int used = -1, num = -1; + for (uns i=0; iplacements); 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->request = r; + p->processed = 0; + p->x = p->y = 0; // To prevent valgrind from complaining + p->variant_used = 0; + p->individual = individual; + switch (r->type) + { + case REQUEST_POINT: ; + 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); +// printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y); +} + +void init_individual(struct individual *i) +{ +//printf("Initing individual\n"); + GARY_INIT(i->placements, num_requests); + GARY_INIT(i->map, 0); + i->penalty = 0; // FIXME } struct placement **get_overlapping(struct placement *p UNUSED) { struct placement **buffer; GARY_INIT(buffer, 0); -return buffer; } + return buffer; +} void filter(struct placement **list UNUSED, bool *pred UNUSED) { @@ -676,3 +1474,21 @@ double randdouble(void) // FIXME: How the hell shall double in range <0, 1> be generated? O:) return 0.5; } + +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) +{ + src->penalty = dest->penalty; + GARY_INIT(dest->placements, GARY_SIZE(src->placements)); + for (uns i=0; iplacements); i++) + { + dest->placements[i] = src->placements[i]; + } +}