int conf_elite_perc = 5;
-double conf_max_section_length = 10;
+double conf_max_section_length = 100;
double conf_max_section_overlay = 10;
int old_best = 0; // FIXME: Shall be int max
int num_requests = 0;
+void make_graph(void);
+void label_graph(void);
+void join_edge(struct graph_edge *e, int dir);
+void bfs(uns longline);
+void make_segments(void);
+
+void make_population(void);
+bool shall_terminate(void);
+void breed(void);
+void mutate(void);
+void elite(void);
+void rank_population(void);
+
+void make_bitmap(struct point_variant *v, struct symbol *sym);
+void make_bitmap_icon(struct point_variant *v, struct sym_icon *si);
+void make_bitmap_point(struct point_variant *v, struct sym_point *sp);
+void make_bitmap_label(struct point_variant *v, struct sym_text *text);
+
+struct request_line *make_new_line(void);
+struct request_section *make_new_section(struct request_line *rl);
+struct request_segment *make_new_segment(struct request_section *rls, struct symbol *sym);
+
+void dump_bitmaps(struct individual *individual);
void dump_graph(void);
void bfs2(void);
void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir);
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);
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->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);
+// printf("Allocated bitmap of %d bools for %d x %d label\n", v->width * v->height, v->width, v->height);
for (int i=0; i<v->height; i++)
for (int j=0; j<v->width; j++)
{
v->bitmap[i*v->width + j] = 1;
- printf("Writing at %d\n", i*v->width + j);
+// printf("Writing at %d\n", i*v->width + j);
}
}
return;
}
- printf("Inited point to [%.2f; %.2f] on %u\n", r->x, r->y, r->zindex);
+// 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)
}
}
+struct request_line *make_new_line(void)
+{
+ struct request_line *rl = GARY_PUSH(requests_line);
+ rl->request.ind = num_requests++;
+ rl->request.type = REQUEST_LINE;
+ GARY_INIT(rl->sections, 0);
+
+ return rl;
+}
+
+struct request_section *make_new_section(struct request_line *rl)
+{
+ struct request_section *rls = GARY_PUSH(rl->sections);
+ rls->request.ind = num_requests++;
+ rls->request.type = REQUEST_SECTION;
+ rls->num_segments = 0;
+ GARY_INIT(rls->segments, 0);
+
+ return rls;
+}
+
+struct request_segment *make_new_segment(struct request_section *rls, struct symbol *sym)
+{
+ struct request_segment *rs = GARY_PUSH(rls->segments);
+ rls->num_segments++;
+
+ rs->request.ind = num_requests++;
+ rs->request.type = REQUEST_SEGMENT;
+
+ struct point_variant *v = malloc(sizeof(struct point_variant));
+ make_bitmap(v, sym);
+ rs->variant = v;
+
+ return rs;
+}
+
void make_segments(void)
{
for (uns i=0; i<GARY_SIZE(longlines); i++)
if (! (longlines[i].first && longlines[i].first->label))
continue;
- struct request_line *request = GARY_PUSH(requests_line);
- request->request.ind = num_requests++;
- request->request.type = REQUEST_LINE;
-
- GARY_INIT(request->sections, 0);
-
- int cur_length = 0;
- struct request_section *rls = GARY_PUSH(request->sections);
- rls->request.ind = num_requests++;
- rls->request.type = REQUEST_SECTION;
- rls->num_segments = 0;
- GARY_INIT(rls->segments, 0);
+ struct request_line *request = make_new_line();
+ struct request_section *rls = make_new_section(request);
+ struct request_segment *rs = NULL;
struct graph_edge *e = longlines[i].first;
- struct request_segment *rs = NULL;
+ int cur_length = 0;
struct sym_text *st = NULL;
if (e->label->type == SYMBOLIZER_TEXT)
}
else
{
+ printf("Warning: Skipping line\n");
continue;
// FIXME;
}
if ((cur_length + e->length > conf_max_section_length) &&
!(cur_length + e->length < conf_max_section_overlay))
{
+ printf("Making new section, new length would be %f, allowed is %.2f / %.2f\n", cur_length + e->length, conf_max_section_length, conf_max_section_overlay);
struct osm_node *n = e->n1->o;
- rs = GARY_PUSH(rls->segments);
- rs->request.type = REQUEST_SEGMENT;
- rs->request.ind = num_requests++;
- rls->num_segments++;
+ rs = make_new_segment(rls, e->label);
rs->x1 = n->x;
rs->y1 = n->y;
// FIXME: Truly compute x2, y2
rs->x2 = n->x;
rs->y2 = n->y;
rs->zindex = e->zindex;
- rs->label = e->label;
- rls = GARY_PUSH(request->sections);
- rls->request.ind = num_requests++;
- rls->request.type = REQUEST_SECTION;
- rls->num_segments = 0;
+ rs->label = malloc(sizeof(struct sym_text));
+ *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
- struct point_variant *v = malloc(sizeof(struct point_variant));
- switch (e->label->type)
- {
- case SYMBOLIZER_POINT:
- make_bitmap_point(v, (struct sym_point *) e->label);
- break;
- case SYMBOLIZER_ICON:
- make_bitmap_icon(v, (struct sym_icon *) e->label);
- break;
- case SYMBOLIZER_TEXT:
- make_bitmap_label(v, (struct sym_text *) e->label);
- break;
- default:
- // FIXME
- ;
- }
- rs->variant = v;
- GARY_INIT(rls->segments, 0);
+ rls = make_new_section(request);
}
- if (e->length < st->tw)
+ if (st && (e->length < st->tw))
{
e = e->next;
+ printf("Warning: Skipping segment\n");
continue;
}
- rs = GARY_PUSH(rls->segments);
- rls->num_segments++;
- rs->request.type = REQUEST_SEGMENT;
- rs->request.ind = num_requests++;
- rs->label = e->label;
-
- struct point_variant *v = malloc(sizeof(struct point_variant));
- switch (e->label->type)
- {
- case SYMBOLIZER_POINT:
- make_bitmap_point(v, (struct sym_point *) e->label);
- break;
- case SYMBOLIZER_ICON:
- make_bitmap_icon(v, (struct sym_icon *) e->label);
- break;
- case SYMBOLIZER_TEXT:
- make_bitmap_label(v, (struct sym_text *) e->label);
- break;
- default:
- // FIXME
- ;
- }
- rs->variant = v;
+ rs = make_new_segment(rls, e->label);
+ rs->label = malloc(sizeof(struct sym_text));
+ *((struct sym_text *) rs->label) = *((struct sym_text *) e->label);
rs->x1 = e->n1->o->x;
rs->y1 = e->n1->o->y;
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;
+ }
}
}
-/***
-* void make_segments_old(void)
-* {
-* printf("Analysing %u longlines\n", GARY_SIZE(longlines));
-* for (uns i=0; i<GARY_SIZE(longlines); i++)
-* {
-* 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_LINE;
-*
-* GARY_INIT(request->segments, 0);
-* request->num_segments = 0;
-*
-* // ->num_variants FIXME
-* // ->variants FIXME
-*
-* struct graph_edge *e = longlines[i].first;
-*
-* if (! e) printf("Oops\n");
-* num_requests++;
-* 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;
-*
-* printf("Segment [%.2f; %.2f] -- [%.2f; %.2f]\n", r->x1, r->y1, r->x2, r->y2);
-*
-* r->zindex = e->zindex;
-* r->variant = malloc(sizeof(struct point_variant)); // FIXME
-* 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;
-* }
-* }
-* }
-***/
-
-/***
-* void dump_linelabel_requests(void)
-* {
-* for (uns i=0; i<GARY_SIZE(requests_line); i++)
-* {
-* print_label(requests_line[i].segments[0].label);
-* }
-* }
-***/
+void dump_linelabel_requests(void)
+{
+ for (uns i=0; i<GARY_SIZE(requests_line); i++)
+ {
+ if (requests_line[i].sections[0].num_segments == 0)
+ {
+ printf("HEY!\n");
+ continue;
+ }
+ printf("Request for linelabel, %d sections\n", GARY_SIZE(requests_line[i].sections));
+ print_label(requests_line[i].sections[0].segments[0].label);
+ for (uns j=0; j<GARY_SIZE(requests_line[i].sections); j++)
+ {
+ printf("%d section, %d segments\n", j, GARY_SIZE(requests_line[i].sections[j].segments));
+ for (uns k=0; k<GARY_SIZE(requests_line[i].sections[j].segments); k++)
+ {
+ struct request_segment *rs = &requests_line[i].sections[j].segments[k];
+ printf("[%.2f; %.2f] -- [%.2f; %.2f]\n", rs->x1, rs->y1, rs->x2, rs->y2);
+ }
+ }
+ printf("\n");
+ }
+}
void dump_bitmaps(struct individual *individual)
{
void dump_individual(struct individual *individual)
{
+printf("*** Dumping INDIVIDUAL ***\n");
printf("(There are %d requests)\n", num_requests);
for (uns i=0; i<GARY_SIZE(individual->placements); i++)
{
printf("*");
break;
case REQUEST_SEGMENT: ;
- printf("Segment placed at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_segment *) p->request)->zindex);
+ 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;
{
make_graph();
label_graph();
-dump_graph();
+//dump_graph();
bfs_wrapper();
-dump_longlines();
+//dump_longlines();
make_segments();
-//dump_linelabel_requests();
+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));
*/
dump_individual(population1[0]);
-dump_bitmaps(population1[0]);
+//dump_bitmaps(population1[0]);
for (uns i=0; i<GARY_SIZE(population1[0]->placements); i++)
{
-printf("(%d) Coping with %d\n", i, 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;
struct request_point *rp = (struct request_point *) population1[0]->placements[i].request;
s = rp->sym;
zindex = rp->zindex;
- printf("%u\n", 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");
+// printf("Assigned label to s\n");
+// print_label(s);
zindex = rs->zindex;
- printf("%u\n", zindex);
+// printf("%u\n", zindex);
+ break;
+ case REQUEST_LINE: ;
+// 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);
+// printf("%u\n", zindex);
break;
default:
- printf("Testing request type (flushing final placements)\n");
+// printf("Testing request type (flushing final placements)\n");
ASSERT(population1[0]->placements[i].request != REQUEST_INVALID);
- printf("Yep, in default, continuing\n");
+// printf("Yep, in default, continuing\n");
continue;
}
-printf("Will plan symbol on %u\n", zindex);
+printf("Will plan symbol at [%.2f; %.2f] on %u\n", population1[0]->placements[i].x, population1[0]->placements[i].y, zindex);
- switch (s->type)
+ if (s) switch (s->type)
{
case SYMBOLIZER_POINT: ;
struct sym_point *sp = (struct sym_point *) 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");
+// printf("Testing symbolizer type\n");
ASSERT(s->type != SYMBOLIZER_INVALID);
}
-
-
-
-/***
-* 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");
-* ;
-* }
-* break;
-* case REQUEST_AREA: ;
-* struct request_area *ra = (struct request_area *) population1[0]->placements[i].request;
-* 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_LINE: ;
-* struct request_line *rl = (struct request_line *) population1[0]->placements[i].request;
-* for (uns j=0; j<GARY_SIZE(rl->segments); 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
-* }
-* break;
-*
-* case REQUEST_SEGMENT: ;
-* //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;
-
- 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)
init_placement(&(individual->placements[p++]), (struct request *) &requests_area[j]);
}
+if (p != num_requests)
+{
+ printf("Say bye\n");
+ exit(42);
+}
+
printf("Testing p\n");
ASSERT(p == num_requests);
}
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: ;
}
gen_coords(p);
- printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
+// printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
}
void init_individual(struct individual *i)
projects / leo.git / blobdiff