int dbg_segments = 0;
int dbg_plan = 0;
+int dbg_requests = 0;
+int dbg_graph = 0;
+int dbg_bfs = 0;
+int dbg_map_parts = 0;
+int dbg_movement = 0;
+int dbg_init = 0;
int page_width_int;
int page_height_int;
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 make_bitmap(struct variant *v, struct symbol *sym);
+void make_bitmap_icon(struct variant *v, struct sym_icon *si);
+void make_bitmap_point(struct variant *v, struct sym_point *sp);
+void make_bitmap_label(struct variant *v, struct sym_text *text);
void cut_edge(struct graph_edge *e, double dist);
struct request_line *make_new_line(void);
num_map_parts = num_map_parts_row * num_map_parts_col;
}
-void make_bitmap(struct point_variant *v, struct symbol *sym)
+void make_bitmap(struct variant *v, struct symbol *sym)
{
switch (sym->type)
{
}
}
-void make_bitmap_icon(struct point_variant *v, struct sym_icon *si)
+void make_bitmap_icon(struct 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)));
+ v->width = si->sir.width + 1;
+ v->height = si->sir.height + 1;
+ v->bitmap = malloc(v->width * v->height * sizeof(bool));
for (int i=0; i<v->width*v->height; i++) v->bitmap[i] = 1;
}
-void make_bitmap_point(struct point_variant *v, struct sym_point *sp)
+void make_bitmap_point(struct variant *v, struct sym_point *sp)
{
- v->width = v->height = sp->size;
- v->bitmap = malloc(sp->size*sp->size * sizeof(bool));
+ v->width = v->height = sp->size + 1;
+ v->bitmap = malloc(v->width * v->height * sizeof(bool));
// FIXME: Okay, memset would be much nicer here
for (int i=0; i<sp->size*sp->size; i++) v->bitmap[i] = 1;
}
-void make_bitmap_label(struct point_variant *v, struct sym_text *text)
+void make_bitmap_label(struct variant *v, struct sym_text *text)
{
v->width = ceil(text->tw);
v->height = ceil(text->th);
void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex)
{
-printf("Adding point\n");
+ if (dbg_requests)
+ printf("Adding point\n");
if (object->type != OSM_TYPE_NODE)
{
printf("Warning: Point label requested on non-point object\n");
r->offset_y = 0;
r->num_variants = 1;
- GARY_INIT(r->variants, 0);
+ GARY_INIT(r->request.variants, 0);
- struct point_variant *v = GARY_PUSH(r->variants);
+ struct variant *v = GARY_PUSH(r->request.variants);
struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
r->x = n->x;
void labeller_add_line(struct symbol *sym, z_index_t zindex)
{
-printf("Adding line on %u\n", zindex);
+ if (dbg_requests)
+ printf("Adding line on %u\n", zindex);
struct buffer_line *b = GARY_PUSH(buffer_line);
b->line = (struct sym_line *) sym;
b->zindex = zindex;
return;
}
- printf("[LAB] Labelling way %ju on %u\n", o->id, zindex);
+ if (dbg_requests)
+ 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;
void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
{
-printf("Adding area on %u\n", zindex);
+ if (dbg_requests)
+ printf("Adding area on %u\n", zindex);
struct request_area *r = GARY_PUSH(requests_area);
r->request.type = REQUEST_AREA;
osm_obj_center(o, &(r->cx), &(r->cy));
- GARY_INIT(r->variants, 0);
- struct point_variant *v = GARY_PUSH(r->variants);
+ GARY_INIT(r->request.variants, 0);
+ struct variant *v = GARY_PUSH(r->request.variants);
switch (sym->type)
{
case SYMBOLIZER_ICON:
- printf("DEBUG: Icon label\n");
+ if (dbg_requests)
+ printf("DEBUG: Icon label\n");
make_bitmap_icon(v, (struct sym_icon *) sym);
break;
case SYMBOLIZER_TEXT:
- printf("DEBUG: Text label\n");
+ if (dbg_requests)
+ printf("DEBUG: Text label\n");
make_bitmap_label(v, (struct sym_text *) sym);
default:
// FIXME
void label_graph(void)
{
-printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
+ if (dbg_graph)
+ printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
for (uns i=0; i<GARY_SIZE(buffer_linelabel); i++)
{
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));
+ if (dbg_graph)
+ 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);
+ if (dbg_graph)
+ printf("Looking for node %ju\n", ref->o->id);
struct graph_node *n = hash_find(ref->o->id);
if (n == NULL)
{
}
else
{
- printf("Searching among %u edges\n", GARY_SIZE(n->edges));
+ if (dbg_graph)
+ printf("Searching among %u edges\n", GARY_SIZE(n->edges));
for (uns j=0; j<GARY_SIZE(n->edges); j++)
{
if (n->edges[j]->id == buffer_linelabel[i].way->o.id)
{
- printf("Labelling node %ju\n", n->id);
+ if (dbg_graph)
+ printf("Labelling node %ju\n", n->id);
n->edges[j]->label = buffer_linelabel[i].label;
n->edges[j]->zindex = buffer_linelabel[i].zindex;
}
void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir)
{
-printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir);
+ if (dbg_bfs)
+ 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; i<GARY_SIZE(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);
+ if (dbg_bfs)
+ 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 (candidate)
{
-printf("New line in longline %u\n", e->longline);
+ if (dbg_bfs)
+ printf("New line in longline %u\n", e->longline);
struct graph_edge *other = candidate;
other->longline = e->longline;
other->dir = dir;
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));
+if (dbg_bfs)
+ printf("BFS called for longline %u\n", longline);
+if (dbg_bfs)
+ printf("%d longlines are believed to exist, %d exist\n", num_longlines, GARY_SIZE(longlines));
for (uns i=0; i<GARY_SIZE(bfs_queue); i++)
{
struct graph_edge *cur = bfs_queue[i];
- printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue));
+ if (dbg_bfs)
+ printf("Exploring new edge %d; %d remaining\n", cur->num, GARY_SIZE(bfs_queue));
//ASSERT(! cur->visited);
cur->visited = longline;
{
GARY_PUSH(longlines);
longlines[num_longlines].first = node->edges[i];
- printf("Running new BFS\n");
- printf("Creating longline %u\n", num_longlines);
+ if (dbg_bfs)
+ printf("Running new BFS\n");
+ if (dbg_bfs)
+ printf("Creating longline %u\n", num_longlines);
GARY_RESIZE(bfs_queue, 0);
struct graph_edge **e = GARY_PUSH(bfs_queue);
*e = node->edges[i];
node->edges[i]->longline = num_longlines;
bfs(node->edges[i]->longline);
//dump_longlines();
- printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0;
- printf("Planned %u edges\n", GARY_SIZE(bfs_queue));
+ if (dbg_bfs)
+ printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0;
+ if (dbg_bfs)
+ printf("Planned %u edges\n", GARY_SIZE(bfs_queue));
num_longlines++;
}
}
rs->request.ind = num_requests++;
rs->request.type = REQUEST_SEGMENT;
- struct point_variant *v = malloc(sizeof(struct point_variant));
+ struct variant *v = malloc(sizeof(struct variant));
make_bitmap(v, sym);
- rs->variant = v;
+ rs->request.variants = v;
return rs;
}
*new = *e;
e->next = new;
+ // FIXME? Create new label for new edge, don't only copy pointer?
+
struct osm_node *n1 = e->n1->o;
struct osm_node *n2 = e->n2->o;
}
else
{
- printf("Warning: Skipping line\n");
+ if (dbg_segments)
+ printf("Warning: Skipping line\n");
continue;
// FIXME;
}
- printf("New longline\n");
+ if (dbg_segments)
+ printf("New longline\n");
while (e)
{
if (e->visited < 0)
for (uns i=0; i<GARY_SIZE(individual->placements); i++)
{
-fprintf(stderr, "%d-th placement\n", i);
+ if (individual->placements[i].variant_used == -1) continue;
+
struct placement *p = &(individual->placements[i]);
- struct point_variant *v = NULL;
+ struct 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]);
+ v = &(p->request->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;
}
}
{
make_graph();
label_graph();
-//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));
}
*/
- dump_individual(population1[0]);
-//dump_bitmaps(population1[0]);
-
plan_individual(population1[0]);
labeller_cleanup();
{
for (int i=0; i<conf_pop_size; i++)
{
- printf("Making individual %d\n", i);
+ if (dbg_init)
+ printf("Making individual %d\n", i);
struct individual *individual = ep_alloc(ep_individuals); init_individual(individual);
population1[i] = individual;
hide_segment_labels(individual);
-if (p != num_requests)
-{
- printf("Say bye\n");
- exit(42);
-}
-
-printf("Testing p\n");
ASSERT(p == num_requests);
}
}
if (dbg_map_parts)
printf("Looking for map parts containing placement of request %d, placed at [%.2f; %.2f]\n", p->request->ind, p->x, p->y);
- struct point_variant v;
+ struct variant v;
switch (p->request->type)
{
case REQUEST_POINT:
- v = ((struct request_point *) p->request)->variants[p->variant_used];
- break;
case REQUEST_SEGMENT:
- v = ((struct request_segment *) p->request)->variant[p->variant_used];
- break;
case REQUEST_AREA:
- v = ((struct request_area *) p->request)->variants[p->variant_used];
+ v = p->request->variants[p->variant_used];
break;
default:
return NULL;
gen_coords_segment(p);
break;
case REQUEST_LINE:
- printf("Not yet implemented\n");
+ if (dbg_movement)
+ printf("Not yet implemented\n");
break;
default:
- printf("Testing request type\n");
+ if (dbg_movement)
+ printf("Testing request type\n");
ASSERT(p->request->type != REQUEST_INVALID);
}
{
double m = (random() % 1000000) / 10000;
m = pow(m, 1.0/3) * flip(1, -1);
- printf("Movement %.2f\n", m);
+ if (dbg_movement)
+ printf("Movement %.2f\n", m);
return m;
}
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);
+ if (dbg_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)
case REQUEST_LINE:
case REQUEST_SEGMENT:
case REQUEST_AREA:
- printf("Not yet implemented\n");
+ if (dbg_movement)
+ printf("Not yet implemented\n");
default:
ASSERT(p->request->type != REQUEST_INVALID);
}
}
gen_coords(p);
-// printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
+ if (dbg_init)
+ printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
}
void init_individual(struct individual *i)
mp->next = mp->prev = NULL;
}
i->penalty = 0; // FIXME
+
+ if (dbg_init)
+ printf("Individual inited, has %u map parts\n", GARY_SIZE(i->map));
}
struct placement **get_overlapping(struct placement *p UNUSED)
projects / leo.git / blobdiff