X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=labeller.c;h=f740b495a8783ac5ed74db2fa882955ec664fa8a;hb=eadd63b657be979276b0f7bab89f76a632473ab4;hp=d64c67a0c7143a90d6d05d64e4d88e765f005d30;hpb=5ac436112370bca9a88fe9ed31f399197b6b08cf;p=leo.git diff --git a/labeller.c b/labeller.c index d64c67a..f740b49 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 @@ -18,6 +21,7 @@ #include #include #include +#include #define BLOCK_SIZE 4096 @@ -37,6 +41,9 @@ struct eltpool *ep_individuals; struct individual **population1; struct individual **population2; +int page_width_int; +int page_height_int; + int num_edges_dbg; int num_nodes; int num_edges = 0; @@ -66,6 +73,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; @@ -77,15 +87,71 @@ int move_max = 1; int num_requests = 0; +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); + +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_icon(struct point_variant *v, struct sym_icon *si) @@ -104,20 +170,41 @@ 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) { + int x_ld = 0; + int y_ld = 0; + int x_lu = 0; + int y_lu = 0; + int x_rd = 0; + int y_rd = 0; + int x_ru = 0; + int y_ru = 0; + + v->width = max4(x_ld, x_lu, x_rd, x_ru) - min4(x_ld, x_lu, x_rd, x_ru); + v->height = max4(y_ld, y_lu, y_rd, y_ru) - min4(y_ld, y_lu, y_rd, y_ru); + //v->bitmap = malloc((int) (ceil(v->width) * ceil(v->height) * sizeof(bool))); + + v->width = ceil(text->tw); + v->height = ceil(text->th); + v->bitmap = malloc(v->width * v->height * sizeof(bool)); + printf("Allocated bitmap of %d bools for %d x %d label\n", v->width * v->height, v->width, v->height); + for (int i=0; iheight; i++) + for (int j=0; jwidth; j++) + { + v->bitmap[i*v->width + j] = 1; + printf("Writing at %d\n", i*v->width + j); + } } void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex) { -/* 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); @@ -125,7 +212,6 @@ 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; r->offset_x = 0; @@ -136,6 +222,9 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t struct point_variant *v = GARY_PUSH(r->variants); + 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: @@ -145,21 +234,22 @@ void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t break; case SYMBOLIZER_POINT: make_bitmap_point(v, (struct sym_point *) sym); - struct osm_node *n = (struct osm_node *) object; - r->x = n->x; - r->y = n->y; 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; } - printf("Inited point to [%.2f; %.2f]\n", r->x, r->y); + 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; @@ -168,26 +258,48 @@ 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; + } + + 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) { +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; + + osm_obj_center(o, &(r->cx), &(r->cy)); - GARY_INIT(r->text_variant, 0); - struct point_variant *v = GARY_PUSH(r->text_variant); - make_bitmap_label(v, r->sym); + 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) @@ -229,15 +341,15 @@ void make_graph(void) 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->dir = 0; + e->line = buffer_line[i].line; + e->dir = DIR_UNSET; + e->label = NULL; struct graph_edge **edge = GARY_PUSH(g_prev->edges); *edge = e; @@ -248,6 +360,8 @@ void make_graph(void) o_prev = o_node; } } + + printf("Made graph with %d edges\n", num_edges_dbg); } void dump_graph(void) @@ -267,7 +381,8 @@ void dump_graph(void) printf("BEWARE! BEWARE! BEWARE!\n"); printf("\t\t"); - if (node->edges[i]->text) printf(" labelled %s;", osm_val_decode(node->edges[i]->text->text)); + 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"); @@ -281,7 +396,8 @@ void label_graph(void) printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel)); for (uns i=0; itext)); + if (buffer_linelabel[i].label->type == SYMBOLIZER_TEXT) + printf("Labelling nodes of way %s\n", osm_val_decode(((struct sym_text *) buffer_linelabel[i].label)->text)); CLIST_FOR_EACH(struct osm_ref *, ref, buffer_linelabel[i].way->nodes) { printf("Looking for node %ju\n", ref->o->id); @@ -298,7 +414,7 @@ printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel)); if (n->edges[j]->id == buffer_linelabel[i].way->o.id) { printf("Labelling node %ju\n", n->id); - n->edges[j]->text = buffer_linelabel[i].text; + n->edges[j]->label = buffer_linelabel[i].label; n->edges[j]->zindex = buffer_linelabel[i].zindex; } } @@ -307,137 +423,204 @@ printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel)); } } -void join_edge(struct graph_edge *e, int 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? - } + +/*** +* void join_edge(struct graph_edge *e, int 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? +* } +* +* struct graph_edge *candidate = NULL; +* for (uns i=0; iedges); 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]; +* } +* +* if ((!other->visited) && (e->text) && (other->text) && (e->text->text == other->text->text)) +* { +* if (e->color == other_node->edges[i]->color) +* { +* if ((!candidate) || (candidate->length < other->length)) +* { +* candidate = other; +* } +* } +* else +* { +* // Beware: Name conflict here +* } +* } +* } +* +* if (candidate) +* { +* candidate->longline = e->longline; +* if (dir == 1) +* { +* if (candidate->n2 != e->n1) +* { +* candidate->n1 = candidate->n2; +* candidate->n2 = e->n1; +* } +* e->prev = candidate; +* candidate->next = e; +* +* longlines[e->longline].first = candidate; +* } +* else +* { +* if (candidate->n1 != e->n2) +* { +* candidate->n2 = candidate->n1; +* candidate->n1 = e->n2; +* } +* e->next = candidate; +* candidate->prev = e; +* } +* } +* } +* ***/ + +/*** +void bfs2(void) +* { +* GARY_INIT(bfs_queue, 0); +* GARY_INIT(longlines, 0); +* +* printf("Making longlines from %u causal lines, using %d graph edges\n", GARY_SIZE(buffer_line), num_edges_dbg); +* +* HASH_FOR_ALL(hash, node) +* { +* for (uns i=0; iedges); 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) +* { +* 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); +* } +* } +* } +* HASH_END_FOR; +* +* GARY_FREE(bfs_queue); +* } +* ***/ + +void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir) +{ + ASSERT(dir < 3); struct graph_edge *candidate = NULL; - for (uns i=0; iedges); 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]; - } - if ((!other->visited) && (e->text) && (other->text) && (e->text->text == other->text->text)) - { - if (e->color == other_node->edges[i]->color) - { - if ((!candidate) || (candidate->length < other->length)) - { - candidate = other; - } - } - else - { - // Beware: Name conflict here - } - } - } + if ((e->num > 31) && (e->num < 48)) printf("Searching for neighbours of %d, in longline %u, BFS dir is %d, edge's dir is %d\n", e->num, e->longline, dir, e->dir); - if (candidate) + + for (uns i=0; iedges); i++) { - candidate->longline = e->longline; - if (dir == 1) - { - if (candidate->n2 != e->n1) - { - candidate->n1 = candidate->n2; - candidate->n2 = e->n1; - } - e->prev = candidate; - candidate->next = e; + struct graph_edge *other = node->edges[i]; +printf("Touching %d\n", other->num); +if (other->num == 44) printf("Longline of 44 is %u\n", other->longline); + if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue; - longlines[e->longline].first = candidate; + if (! other->visited) { + struct graph_edge **e_ptr = GARY_PUSH(bfs_queue); + *e_ptr = other; + other->visited = 1; } - else + + 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)) +// (e->text) && (other->text) && (e->text->text == other->text->text)) { - if (candidate->n1 != e->n2) - { - candidate->n2 = candidate->n1; - candidate->n1 = e->n2; - } - e->next = candidate; - candidate->prev = e; + if (! candidate || (other->length > candidate->length)) + candidate = other; } } -} - -void bfs2(void) -{ - GARY_INIT(bfs_queue, 0); - GARY_INIT(longlines, 0); - - printf("Making longlines from %u causal lines, using %d graph edges\n", GARY_SIZE(buffer_line), num_edges_dbg); - HASH_FOR_ALL(hash, node) + if (candidate) { - for (uns i=0; iedges); 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) - { - 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) + struct graph_edge *other = candidate; +dbg_num_hits++; + other->longline = e->longline; + other->dir = dir; + other->anode = (other->n1->id == node->id ? other->n2 : other->n1); + other->bnode = (other->n1->id == node->id ? other->n1 : other->n2); + switch (dir) { - join_edge(e, 2); + case 1: + e->prev = other; + other->next = e; + longlines[other->longline].first = other; + break; + case 2: + e->next = other; + other->prev = e; + break; + default: + printf("Oops\n"); + ASSERT(0); } - } } - HASH_END_FOR; - - GARY_FREE(bfs_queue); } -void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, int dir) +void ya_bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir) { - ASSERT(dir < 3); +printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir); struct graph_edge *candidate = NULL; - if ((e->num > 31) && (e->num < 48)) printf("Searching for neighbours of %d, in longline %u, BFS dir is %d, edge's dir is %d\n", e->num, e->longline, dir, e->dir); - - for (uns i=0; iedges); i++) { struct graph_edge *other = node->edges[i]; -printf("Touching %d\n", other->num); -if (other->num == 44) printf("Longline of 44 is %u\n", other->longline); +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); - if (! other->visited) { +printf("Testing %d ?= %d\n", other->visited, e->longline); + if (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 = 1; + other->visited = e->longline; } if (((other->n1->id == node->id) && (other->n2->id == anode->id)) || @@ -445,7 +628,9 @@ if (other->num == 44) printf("Longline of 44 is %u\n", other->longline); continue; if (((other->n1->id == node->id) || (other->n2->id == node->id)) && - (e->text) && (other->text) && (e->text->text == other->text->text)) + (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 (! candidate || (other->length > candidate->length)) candidate = other; @@ -454,20 +639,26 @@ if (other->num == 44) printf("Longline of 44 is %u\n", other->longline); if (candidate) { +printf("New line in longline %u\n", e->longline); struct graph_edge *other = candidate; -dbg_num_hits++; other->longline = e->longline; other->dir = dir; - other->anode = (other->n1->id == node->id ? other->n2 : other->n1); - other->bnode = (other->n1->id == node->id ? other->n1 : other->n2); + 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) { - case 1: + case DIR_BWD: e->prev = other; other->next = e; longlines[other->longline].first = other; break; - case 2: + case DIR_FWD: e->next = other; other->prev = e; break; @@ -506,6 +697,45 @@ void bfs(void) } } +void ya_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; + ya_bfs_edge(cur, cur->n1, cur->n2, DIR_BWD); + ya_bfs_edge(cur, cur->n2, cur->n1, DIR_FWD); + } + else + { + switch (cur->dir) + { + case DIR_BWD: + ya_bfs_edge(cur, cur->n1, cur->n2, cur->dir); + break; + case DIR_FWD: + ya_bfs_edge(cur, cur->n2, cur->n1, cur->dir); + break; + default: + // FIXME + ; + } + } + } +} + void bfs_wrapper(void) { GARY_INIT(bfs_queue, 0); @@ -533,82 +763,137 @@ void bfs_wrapper(void) GARY_FREE(bfs_queue); } -void oldbfs(void) +void ya_bfs_wrapper(void) { - printf("Starting outer BFS\n"); - printf("There are %u buffered lines and %d eges\n", GARY_SIZE(buffer_line), num_edges_dbg); - GARY_INIT(bfs_queue, 0); GARY_INIT(longlines, 0); - int dbg_bfs_continues = 0; - HASH_FOR_ALL(hash, node) { - // FIXME: Skip if visited node - for (uns i=0; iedges); i++) { - struct graph_edge *e = node->edges[i]; - - if (e->visited) continue; - - // BFS itself - for (uns i1=0; i1n1->edges); i1++) - { - struct graph_edge *other = e->n1->edges[i1]; - if (other->visited) { dbg_bfs_continues++; continue; } - - if (((other->n1->id == e->n1->id) || (other->n2->id == e->n1->id)) && - (e->text) && (other->text) && (e->text->text == other->text->text)) - { -// printf("Hit\n"); - other->visited = 1; - } - } - for (uns i2=0; i2n2->edges); i2++) + if ((node->edges[i]->label) && (node->edges[i]->longline == (uns) -1)) { - struct graph_edge *other = e->n2->edges[i2]; - if (other->visited) {dbg_bfs_continues++; continue; } - - if (((other->n1->id == e->n2->id) || (other->n2->id == e->n2->id)) && - (e->text) && (other->text) && (e->text->text == other->text->text)) - { -// printf("Hit\n"); - other->visited = 1; - } + GARY_PUSH(longlines); + 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; + ya_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++; } } } - HASH_END_FOR; - printf("Total: %d hits, %d visited edges skipped\n", dbg_num_hits, dbg_bfs_continues); GARY_FREE(bfs_queue); } +/*** +* void oldbfs(void) +* { +* printf("Starting outer BFS\n"); +* printf("There are %u buffered lines and %d eges\n", GARY_SIZE(buffer_line), num_edges_dbg); +* +* GARY_INIT(bfs_queue, 0); +* GARY_INIT(longlines, 0); +* +* int dbg_bfs_continues = 0; +* +* HASH_FOR_ALL(hash, node) +* { +* // FIXME: Skip if visited node +* +* for (uns i=0; iedges); i++) +* { +* struct graph_edge *e = node->edges[i]; +* +* if (e->visited) continue; +* +* // BFS itself +* for (uns i1=0; i1n1->edges); i1++) +* { +* struct graph_edge *other = e->n1->edges[i1]; +* if (other->visited) { dbg_bfs_continues++; continue; } +* +* if (((other->n1->id == e->n1->id) || (other->n2->id == e->n1->id)) && +* (e->text) && (other->text) && (e->text->text == other->text->text)) +* { +* // printf("Hit\n"); +* other->visited = 1; +* } +* } +* for (uns i2=0; i2n2->edges); i2++) +* { +* struct graph_edge *other = e->n2->edges[i2]; +* if (other->visited) {dbg_bfs_continues++; continue; } +* +* if (((other->n1->id == e->n2->id) || (other->n2->id == e->n2->id)) && +* (e->text) && (other->text) && (e->text->text == other->text->text)) +* { +* // printf("Hit\n"); +* other->visited = 1; +* } +* } +* } +* } +* +* HASH_END_FOR; +* printf("Total: %d hits, %d visited edges skipped\n", dbg_num_hits, dbg_bfs_continues); +* +* GARY_FREE(bfs_queue); +* } +* ***/ + void dump_longlines(void) +{ +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; + } + } +} + +void dump_longlines_old(void) { for (uns i=0; i Longline %u;", i); - if (longlines[i].first->text) printf(" labelled %s", osm_val_decode(longlines[i].first->text->text)); + if (longlines[i].first->label && longlines[i].first->label->type == SYMBOLIZER_TEXT) printf(" labelled %s", osm_val_decode(((struct sym_text *) longlines[i].first->label)->text)); printf("\n"); while (e) { printf("\t#%ju (%d)", e->id, e->num); switch (e->dir) { - case 1: - printf("[%.2f; %.2f] -- #%u [%.2f; %.2f] (dir %d)\n", e->anode->o->x, e->anode->o->y, e->bnode->o->o.id, e->bnode->o->x, e->bnode->o->y, e->dir); + case DIR_BWD: + printf("[%.2f; %.2f] -- #%ju [%.2f; %.2f] (dir %d)\n", e->anode->o->x, e->anode->o->y, e->bnode->o->o.id, e->bnode->o->x, e->bnode->o->y, e->dir); break; - case 2: - printf("[%.2f; %.2f] -- #%u [%.2f; %.2f] (dir %d)\n", e->bnode->o->x, e->bnode->o->y, e->anode->o->o.id, e->anode->o->x, e->anode->o->y, e->dir); + case DIR_FWD: + printf("[%.2f; %.2f] -- #%ju [%.2f; %.2f] (dir %d)\n", e->bnode->o->x, e->bnode->o->y, e->anode->o->o.id, e->anode->o->x, e->anode->o->y, e->dir); break; - case 0: - printf("[%.2f; %.2f] -- #%u [%.2f; %.2f] (dir %d)\n", e->n1->o->x, e->n1->o->y, e->n2->o->o.id, e->n2->o->x, e->n2->o->y, e->dir); + case DIR_CENTER: + printf("[%.2f; %.2f] -- #%ju [%.2f; %.2f] (dir %d)\n", e->n1->o->x, e->n1->o->y, e->n2->o->o.id, e->n2->o->x, e->n2->o->y, e->dir); break; default: printf("%d\n", e->dir); @@ -619,17 +904,106 @@ void dump_longlines(void) } } +void make_segments_new(void) +{ + for (uns i=0; ilabel)) + continue; + + struct request_line *request = GARY_PUSH(requests_line); + request->request.ind = -1; + 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 graph_edge *e = longlines[i].first; + struct request_segment *rs = NULL; + + struct sym_text *st = NULL; + if (e->label->type == SYMBOLIZER_TEXT) + { + st = (struct sym_text *) e->label; + } + else + { + continue; + // FIXME; + } + + while (e) + { + if ((cur_length + e->length > conf_max_section_length) && + !(cur_length + e->length < conf_max_section_overlay)) + { + struct osm_node *n = e->n1->o; + + rs = GARY_PUSH(rls->segments); + rls->num_segments++; + rs->x1 = n->x; + rs->y1 = n->y; + // FIXME: Truly compute x2, y2 + rs->x2 = n->x; + rs->y2 = n->y; + + rls = GARY_PUSH(request->sections); + rls->request.ind = num_requests++; + rls->request.type = REQUEST_SECTION; + rls->num_segments = 0; + GARY_INIT(rls->segments, 0); + } + + if (e->length < st->tw) + { + e = e->next; + continue; + } + + rs = GARY_PUSH(rls->segments); + rls->num_segments++; + rs->request.type = REQUEST_SEGMENT; + rs->request.ind = num_requests++; + rs->label = 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; + + rs->zindex = e->zindex; + + cur_length += e->length; + + e = e->next; + } + } +} + void make_segments(void) { printf("Analysing %u longlines\n", GARY_SIZE(longlines)); for (uns i=0; itext) continue; + if (! longlines[i].first->label) continue; // printf("Survived! %s\n", osm_val_decode(longlines[i].first->text->text)); printf("New longline\n"); + +if (longlines[i].first->label->type != SYMBOLIZER_TEXT) +{ + printf("Heh?\n"); + exit(42); +} struct request_line *request = GARY_PUSH(requests_line); request->request.ind = -1; - request->request.type = REQUEST_LINELABEL; + request->request.type = REQUEST_LINE; GARY_INIT(request->segments, 0); request->num_segments = 0; @@ -643,7 +1017,8 @@ printf("New longline\n"); num_requests++; while (e) { - if (! e->text) break; + if (! e->label) break; + struct request_segment *r = GARY_PUSH(request->segments); request->num_segments++; @@ -658,17 +1033,38 @@ printf("New longline\n"); 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 -//printf("Segment [%.2f; %.2f] -- [%.2f; %.2f]\n", r->x1, r->y1, r->x2, r->y2); +printf("Segment [%.2f; %.2f] -- [%.2f; %.2f]\n", r->x1, r->y1, r->x2, r->y2); - r->sym = e->sym; + r->sym = e->line; 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; - r->variant = malloc(sizeof(struct point_variant)); // FIXME - make_bitmap_label(r->variant, e->text); + switch (e->label->type) + { + case SYMBOLIZER_TEXT: ; + struct sym_text *st = malloc(sizeof(struct sym_text)); + ((struct symbol *) st)->o = e->label->o; + ((struct symbol *) st)->type = SYMBOLIZER_TEXT; + st->x = r->x1; + st->y = r->y1; + st->text = ((struct sym_text *) e->label)->text; + st->text_color = ((struct sym_text *) e->label)->text_color; + st->font = ((struct sym_text *) e->label)->font; + st->opacity = ((struct sym_text *) e->label)->opacity; + st->halo_color = ((struct sym_text *) e->label)->halo_color; + st->halo_radius = ((struct sym_text *) e->label)->halo_radius; + st->halo_opacity = ((struct sym_text *) e->label)->halo_opacity; + st->tw = ((struct sym_text *) e->label)->tw; + st->th = ((struct sym_text *) e->label)->th; + st->td = ((struct sym_text *) e->label)->td; + r->label = (struct symbol *) st; + // FIXME: This shall be done in more elegant way + make_bitmap_label(r->variant, (struct sym_text *) e->label); + break; + default: + // FIXME + printf("Got here?\n"); + ; + } e = e->next; } @@ -679,12 +1075,72 @@ void dump_linelabel_requests(void) { for (uns i=0; itext)); + print_label(requests_line[i].segments[0].label); } } +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++) + { + 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: + ASSERT(p->request->type != REQUEST_INVALID); + continue; + } + + 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]); @@ -692,15 +1148,23 @@ void dump_individual(struct individual *individual) switch (p->request->type) { case REQUEST_POINT: - printf("Point at [%.2f; %.2f]\n", p->x, p->y); + printf("Point at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_point *) p->request)->zindex); break; - case REQUEST_LINELABEL: ; + case REQUEST_LINE: ; struct request_line *rl = (struct request_line *) p->request; - printf("%d-segment longline %s\n", rl->num_segments, osm_val_decode(rl->segments[0].text->text)); + print_label(rl->segments[0].label); break; - case REQUEST_AREALABEL: ; + case REQUEST_SEGMENT: ; + printf("Segment placed at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_segment *) p->request)->zindex); + break; + case REQUEST_AREA: ; struct request_area *ra = (struct request_area *) p->request; - printf("Area label %s at [%.2f; %.2f]\n", osm_val_decode(ra->sym->text), p->x, p->y); + 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: + ASSERT(p->request->type != 0); } } printf("\nTotal penalty: %d\n", individual->penalty); @@ -711,10 +1175,10 @@ void labeller_label(void) make_graph(); label_graph(); dump_graph(); - bfs_wrapper(); + ya_bfs_wrapper(); dump_longlines(); - make_segments(); -dump_linelabel_requests(); + make_segments_new(); +//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)); @@ -737,9 +1201,71 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY */ dump_individual(population1[0]); +dump_bitmaps(population1[0]); for (uns i=0; iplacements); i++) { +printf("Coping with %d\n", population1[0]->placements[i].request->type); + + struct symbol *s = NULL; + z_index_t zindex = 0; + switch (population1[0]->placements[i].request->type) + { + case REQUEST_POINT: ; + struct request_point *rp = (struct request_point *) population1[0]->placements[i].request; + s = rp->sym; + zindex = rp->zindex; + printf("%u\n", zindex); + break; + case REQUEST_SEGMENT: ; + struct request_segment *rs = (struct request_segment *) population1[0]->placements[i].request; + s = rs->label; + printf("Assigned label to s\n"); + zindex = rs->zindex; + printf("%u\n", zindex); + break; + case REQUEST_AREA: ; + struct request_area *ra = (struct request_area *) population1[0]->placements[i].request; + s = ra->label; + zindex = ra->zindex; + printf("%u\n", zindex); + break; + default: + ASSERT(population1[0]->placements[i].request != REQUEST_INVALID); + printf("Yep, in default, continuing\n"); + continue; + } + +printf("Will plan symbol on %u\n", zindex); + + switch (s->type) + { + case SYMBOLIZER_POINT: ; + struct sym_point *sp = (struct sym_point *) s; + sp->x = population1[0]->placements[i].x; + sp->y = population1[0]->placements[i].y; + sym_plan((struct symbol *) sp, zindex); + break; + case SYMBOLIZER_ICON: ; + struct sym_icon *si = (struct sym_icon *) s; + si->sir.x = population1[0]->placements[i].x; + si->sir.y = population1[0]->placements[i].y; + sym_plan((struct symbol *) si, zindex); + break; + case SYMBOLIZER_TEXT: ; + struct sym_text *st = (struct sym_text *) s; + st->x = population1[0]->placements[i].x; + st->y = population1[0]->placements[i].y; + st->next_duplicate = NULL; + sym_plan((struct symbol *) st, zindex); + break; + default: + ASSERT(s->type != SYMBOLIZER_INVALID); + } + + + +/*** switch (population1[0]->placements[i].request->type) { case REQUEST_POINT: ; @@ -747,46 +1273,71 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY switch (rp->sym->type) { case SYMBOLIZER_POINT: ; -// printf("Moving point to final destination\n"); + printf("Moving point to final destination\n"); struct sym_point *sp = (struct sym_point *) rp->sym; sp->x = population1[0]->placements[i].x; sp->y = population1[0]->placements[i].y; sym_plan((struct symbol *) sp, rp->zindex); break; case SYMBOLIZER_ICON: ; -// printf("Moving icon to final destination\n"); + printf("Moving icon to final destination\n"); 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: + printf("Haúúú 1\n"); ; } break; - case REQUEST_AREALABEL: ; + case REQUEST_AREA: ; struct request_area *ra = (struct request_area *) population1[0]->placements[i].request; - sym_plan((struct symbol *) ra->sym, ra->zindex); + switch (ra->label->type) + { + case SYMBOLIZER_ICON + case SYMBOLIZER_TEXT: ; + struct sym_text *st = (struct sym_text *) ra->label; + st->x = population1[0]->placements[i].x; + st->y = population1[0]->placements[i].y; + break; + default: + // FIXME + ; + } + if (ra->label->type == SYMBOLIZER_INVALID) printf("Haúúú 2\n"); + sym_plan((struct symbol *) ra->label, ra->zindex); break; - case REQUEST_LINELABEL: ; + case REQUEST_LINE: ; struct request_line *rl = (struct request_line *) population1[0]->placements[i].request; for (uns j=0; jsegments); 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; - rl->segments[j].text->x = population1[0]->placements[i].x; - rl->segments[j].text->y = population1[0]->placements[i].y; - sym_plan((struct symbol *) rl->segments[j].text, rl->segments[j].zindex); // FIXME: z-index + switch (rl->segments[j].label->type) + { + case SYMBOLIZER_TEXT: + ((struct sym_text *) rl->segments[j].label)->next_duplicate = NULL; + ((struct sym_text *) rl->segments[j].label)->next_in_tile = NULL; + printf("Planning text "); + print_label(rl->segments[j].label); + default: + printf("Haúúú 3\n"); + // FIXME + ; + } + sym_plan((struct symbol *) rl->segments[j].label, rl->segments[j].zindex); // FIXME: z-index } break; -/* + case REQUEST_SEGMENT: ; - struct request_segment *rs = (struct request_segment *) population1[0]->placements[i].request; + //struct request_segment *rs = (struct request_segment *) population1[0]->placements[i].request; printf("Segment!\n"); -*/ + + default: + ASSERT(population1[0]->placements[i].request->type != REQUEST_INVALID); } +***/ + } return; @@ -814,6 +1365,7 @@ void make_population(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) @@ -1078,6 +1668,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); } } @@ -1092,6 +1688,7 @@ void init_placement(struct placement *p, struct request *r) // FIXME p->request = r; p->processed = 0; + p->x = p->y = 0; // To prevent valgrind from complaining switch (r->type) { case REQUEST_POINT: ; @@ -1099,17 +1696,31 @@ void init_placement(struct placement *p, struct request *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_AREALABEL: ; + case REQUEST_AREA: ; struct request_area *ra = (struct request_area *) r; - struct sym_text *st = ra->sym; - p->x = st->x; - p->y = st->y; + 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); + ASSERT(0); } + + gen_coords(p); + printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y); } void init_individual(struct individual *i)