X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=labeller.c;h=a0f3d57be20fc4a015af6edfc1a55143310f6743;hb=3eccb27b874cf751c7c807ce444b8bcb37ecf768;hp=32577bfe8aa4431ffa26068766e3ea315100f038;hpb=df24604990174cde6413d9902b7521a5daffadaa;p=leo.git diff --git a/labeller.c b/labeller.c index 32577bf..a0f3d57 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,11 @@ struct eltpool *ep_individuals; struct individual **population1; struct individual **population2; +int dbg_segments = 0; + +int page_width_int; +int page_height_int; + int num_edges_dbg; int num_nodes; int num_edges = 0; @@ -66,6 +75,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,9 +89,33 @@ int move_max = 1; int num_requests = 0; +void make_graph(void); +void label_graph(void); +void join_edge(struct graph_edge *e, int dir); +void bfs(uns longline); +void make_segments(void); + +void make_population(void); +bool shall_terminate(void); +void breed(void); +void mutate(void); +void elite(void); +void rank_population(void); + +void make_bitmap(struct point_variant *v, struct symbol *sym); +void make_bitmap_icon(struct point_variant *v, struct sym_icon *si); +void make_bitmap_point(struct point_variant *v, struct sym_point *sp); +void make_bitmap_label(struct point_variant *v, struct sym_text *text); + +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, int dir); +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); @@ -87,6 +123,65 @@ 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 init_placement(struct placement *p, struct request *r); +void init_individual(struct individual *i); +struct map_part **get_parts(struct placement *symbol, struct individual *individual); + +int randint(int min, int max); + +struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2); +void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child); +void move_symbol(struct placement *p); +void move_symbol_point(struct placement *p); + +struct placement **get_overlapping(struct placement *p); +void filter(struct placement **list, bool *pred); + +int flip(int a, int b); +double randdouble(void); + +void cleanup(void); + +void copy_individual(struct individual *src, struct individual *dest); + +int max2(int a, int b); +int min2(int a, int b); +int max4(int a, int b, int c, int d); +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) @@ -108,6 +203,27 @@ void labeller_init(void) 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) @@ -126,8 +242,31 @@ 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) @@ -177,12 +316,12 @@ printf("Adding point\n"); 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\n"); +printf("Adding line on %u\n", zindex); struct buffer_line *b = GARY_PUSH(buffer_line); b->line = (struct sym_line *) sym; b->zindex = zindex; @@ -197,7 +336,7 @@ void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t return; } - printf("[LAB] Labelling way %ju\n", o->id); + 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; @@ -206,7 +345,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) { -printf("Adding area\n"); +printf("Adding area on %u\n", zindex); struct request_area *r = GARY_PUSH(requests_area); r->request.type = REQUEST_AREA; @@ -223,9 +362,11 @@ printf("Adding area\n"); 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 @@ -272,14 +413,14 @@ 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->line = buffer_line[i].line; - e->dir = 0; + e->dir = DIR_UNSET; e->label = NULL; struct graph_edge **edge = GARY_PUSH(g_prev->edges); @@ -291,6 +432,8 @@ void make_graph(void) o_prev = o_node; } } + + printf("Made graph with %d edges\n", num_edges_dbg); } void dump_graph(void) @@ -352,143 +495,24 @@ 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? -* } -* -* 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, int dir) +void 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 ((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 = 1; + other->visited = e->longline; } if (((other->n1->id == node->id) && (other->n2->id == anode->id)) || @@ -499,7 +523,6 @@ if (other->num == 44) printf("Longline of 44 is %u\n", other->longline); (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 || (other->length > candidate->length)) candidate = other; @@ -508,20 +531,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; @@ -532,30 +561,41 @@ dbg_num_hits++; } } -void bfs(void) +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); + printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue)); //ASSERT(! cur->visited); - cur->visited = 1; + cur->visited = longline; + if (cur->longline == (uns) -1) - { - GARY_PUSH(longlines); - cur->longline = num_longlines++; - longlines[cur->longline].first = cur; - } + continue; - if (!cur->anode) + if (cur->dir == DIR_UNSET) { - bfs_edge(cur, cur->n1, cur->n2, 1); - bfs_edge(cur, cur->n2, cur->n1, 2); + cur->dir = DIR_CENTER; + bfs_edge(cur, cur->n1, cur->n2, DIR_BWD); + bfs_edge(cur, cur->n2, cur->n1, DIR_FWD); } else { - bfs_edge(cur, cur->anode, cur->bnode, cur->dir); + switch (cur->dir) + { + 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 + ; + } } } } @@ -569,16 +609,21 @@ void bfs_wrapper(void) { for (uns i=0; iedges); i++) { - if (! node->edges[i]->visited) + if ((node->edges[i]->label) && (node->edges[i]->longline == (uns) -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]; - bfs(); + 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++; } } } @@ -587,174 +632,183 @@ void bfs_wrapper(void) 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"); - printf("> Longline %u;", i); - 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] -- #%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] -- #%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] -- #%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); - ASSERT(0); - } + 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 make_segments(void) +struct request_line *make_new_line(void) { -printf("Analysing %u longlines\n", GARY_SIZE(longlines)); - for (uns i=0; ilabel) continue; -// printf("Survived! %s\n", osm_val_decode(longlines[i].first->text->text)); -printf("New longline\n"); + 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; +} -if (longlines[i].first->label->type != SYMBOLIZER_TEXT) +struct request_section *make_new_section(struct request_line *rl) { - printf("Heh?\n"); - exit(42); + 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)); } - struct request_line *request = GARY_PUSH(requests_line); - request->request.ind = -1; - request->request.type = REQUEST_LINE; - GARY_INIT(request->segments, 0); - request->num_segments = 0; +void make_segments(void) +{ + for (uns i=0; ilabel)) + continue; - // ->num_variants FIXME - // ->variants FIXME + struct request_line *request = make_new_line(); + struct request_section *rls = make_new_section(request); + struct request_segment *rs = NULL; struct graph_edge *e = longlines[i].first; + double cur_length = 0; - if (! e) printf("Oops\n"); - num_requests++; + struct sym_text *st = NULL; + if (e->label->type == SYMBOLIZER_TEXT) + { + st = (struct sym_text *) e->label; + } + else + { + printf("Warning: Skipping line\n"); + continue; + // FIXME; + } + + printf("New longline\n"); while (e) { - if (! e->label) break; - struct request_segment *r = GARY_PUSH(request->segments); - request->num_segments++; - - r->request.ind = num_requests++; - r->request.type = REQUEST_SEGMENT; - - struct osm_node *n = e->n1->o; - r->x1 = n->x; - r->y1 = n->y; - n = e->n2->o; - r->x2 = n->x; - r->y2 = n->y; - r->k = abs(r->x2 - r->x1) / (abs(r->y2 - r->y1) + 0.001); // FIXME: Hack to prevent floating point exception when y2 = y1 - -printf("Segment [%.2f; %.2f] -- [%.2f; %.2f]\n", r->x1, r->y1, r->x2, r->y2); - - r->sym = e->line; - r->zindex = e->zindex; - r->variant = malloc(sizeof(struct point_variant)); // FIXME - switch (e->label->type) + if (cur_length + e->length > conf_max_section_length + conf_max_section_overlay) { - 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"); - ; + 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; + + 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; + } } } @@ -762,12 +816,92 @@ 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++) { @@ -776,21 +910,30 @@ printf("(There are %d requests)\n", num_requests); 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_LINE: ; struct request_line *rl = (struct request_line *) p->request; - print_label(rl->segments[0].label); + 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]\n", p->x, p->y); + 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); } } @@ -801,9 +944,9 @@ void labeller_label(void) { make_graph(); label_graph(); -dump_graph(); +//dump_graph(); bfs_wrapper(); -dump_longlines(); +//dump_longlines(); make_segments(); dump_linelabel_requests(); @@ -828,95 +971,90 @@ 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); +//printf("(%d) Coping with %d\n", i, 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; - switch (rp->sym->type) - { - case SYMBOLIZER_POINT: ; - 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"); - 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"); - ; - } + s = rp->sym; + zindex = rp->zindex; +// printf("%u\n", zindex); break; - case REQUEST_AREA: ; - struct request_area *ra = (struct request_area *) population1[0]->placements[i].request; - if (ra->label->type == SYMBOLIZER_INVALID) printf("Haúúú 2\n"); - sym_plan((struct symbol *) ra->label, ra->zindex); + case REQUEST_SEGMENT: ; + struct request_segment *rs = (struct request_segment *) population1[0]->placements[i].request; + s = rs->label; +// printf("Assigned label to s\n"); +// print_label(s); + zindex = rs->zindex; +// printf("%u\n", zindex); break; - case REQUEST_LINE: ; - struct request_line *rl = (struct request_line *) population1[0]->placements[i].request; - for (uns j=0; jsegments); j++) - { - 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 - } +// printf("*** Line detected ***\n"); + 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: +// printf("Testing request type (flushing final placements)\n"); + ASSERT(population1[0]->placements[i].request != REQUEST_INVALID); +// printf("Yep, in default, continuing\n"); + continue; + } - case REQUEST_SEGMENT: ; - //struct request_segment *rs = (struct request_segment *) population1[0]->placements[i].request; - printf("Segment!\n"); +printf("Will plan symbol at [%.2f; %.2f] on %u\n", population1[0]->placements[i].x, population1[0]->placements[i].y, zindex); - default: - ASSERT(population1[0]->placements[i].request->type != REQUEST_INVALID); + if (s) 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; + printf("Planning text %s at [%.2f; %.2f] on %u\n", osm_val_decode(st->text), st->x, st->y, zindex); + sym_plan((struct symbol *) st, zindex); + break; + default: +// printf("Testing symbolizer type\n"); + ASSERT(s->type != SYMBOLIZER_INVALID); } } - return; - - while (! shall_terminate()) - { - iteration++; + labeller_cleanup(); - breed(); - mutate(); - elite(); - rank_population(); - // sort population by fitness + return; +} - struct individual **swp = population1; - population1 = population2; - printf("Swapped populations\n"); - population2 = swp; - // GARY_RESIZE(population2, 0) -- is it needed? - pop2_ind = 0; - } +void labeller_cleanup(void) +{ } void make_population(void) { for (int i=0; iplacements[p++]), (struct request *) &requests_point[j]); } + for (uns j=0; jplacements[p++]), (struct request *) &requests_line[j]); - for (uns k=0; kplacements[p++]), (struct request *) &requests_line[j].segments[k]); + init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].sections[k]); + + for (uns l=0; lplacements[p++]), (struct request *) &requests_line[j].sections[k].segments[l]); + } } } + for (uns j=0; jplacements[p++]), (struct request *) &requests_area[j]); } +if (p != num_requests) +{ + printf("Say bye\n"); + exit(42); +} + +printf("Testing p\n"); ASSERT(p == num_requests); } } @@ -1100,18 +1253,51 @@ void gen_coords(struct placement *p) { case REQUEST_POINT: gen_coords_point(p); - case REQUEST_LINE: - case REQUEST_SEGMENT: + break; case REQUEST_AREA: + gen_coords_area(p); + break; + case REQUEST_SEGMENT: + gen_coords_segment(p); + break; + case REQUEST_LINE: printf("Not yet implemented\n"); + break; default: + printf("Testing request type\n"); ASSERT(p->request->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) @@ -1135,6 +1321,7 @@ struct map_part **get_parts(struct placement *symbol, struct individual *individ int randint(int min, int max) { + if (min == max) return min; int r = random(); //printf("Returning %d + (%d %% (%d - %d)) = %d + %d %% %d = %d + %d = %d\n", min, r, max, min, min, r, max-min, min, r%(max-min), min+(r%(max-min))); return min + (r % (max - min)); @@ -1207,6 +1394,8 @@ 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 + p->variant_used = 0; switch (r->type) { case REQUEST_POINT: ; @@ -1216,6 +1405,10 @@ void init_placement(struct placement *p, struct request *r) 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; @@ -1225,11 +1418,15 @@ void init_placement(struct placement *p, struct request *r) 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); } - printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y); + gen_coords(p); +// printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y); } void init_individual(struct individual *i)