+#include <errno.h>
+
#include <ucw/lib.h>
#include <ucw/gary.h>
#include <ucw/mempool.h>
#include "leo.h"
#include "sym.h"
+#include "map.h"
#include "labeller.h"
#define HASH_NODE struct graph_node
#define HASH_KEY_ATOMIC id
#define HASH_WANT_FIND
#define HASH_WANT_NEW
+#define HASH_WANT_CLEANUP
#include <ucw/hashtable.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
+#include <fcntl.h>
#define BLOCK_SIZE 4096
static struct request_line *requests_line;
static struct request_area *requests_area;
-static struct graph_edge *bfs_queue;
+static struct graph_edge **bfs_queue;
static struct longline *longlines; int num_longlines;
static struct buffer_line *buffer_line;
static struct buffer_linelabel *buffer_linelabel;
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;
+int dbg_num_hits = 0;
+
int conf_pop_size = 50;
int conf_penalty_bound = 0;
int conf_stagnation_bound = 0;
-int conf_iteration_limit = 5;
+int conf_iteration_limit = 4;
int conf_term_cond = TERM_COND_ITERATIONS;
int conf_breed_rbest_perc = 80;
int conf_breed_pop_size_perc = 20;
-int conf_breed_perc = 50;
+int conf_breed_perc = 50; // Percentage of new pop created by breeding
bool conf_mutate_children = 1;
int conf_mutate_children_prob = 0.3;
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;
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)
{
v->width = si->sir.icon->width;
v->height = si->sir.icon->height;
+ v->bitmap = malloc((int) ceil(v->width * v->height * sizeof(bool)));
+ for (int i=0; i<v->width*v->height; i++) v->bitmap[i] = 1;
}
void make_bitmap_point(struct point_variant *v, struct sym_point *sp)
for (int i=0; i<sp->size*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; 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);
+ }
}
void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex)
{
-/* FIXME
- What does correct check look like?
+printf("Adding point\n");
if (object->type != OSM_TYPE_NODE)
{
- // FIXME
+ printf("Warning: Point label requested on non-point object\n");
return;
}
-*/
struct request_point *r = GARY_PUSH(requests_point);
+
+ r->request.type = REQUEST_POINT;
+ r->request.ind = num_requests++;
+
r->sym = sym;
- r->object = object;
r->zindex = zindex;
- ((struct request *)r)->ind = num_requests++;
-
- struct osm_node *n = (struct osm_node *) object;
- r->x = n->x;
- r->y = n->y;
r->offset_x = 0;
r->offset_y = 0;
struct point_variant *v = GARY_PUSH(r->variants);
- if (sym->type == SYMBOLIZER_ICON)
+ struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
+ r->x = n->x;
+ r->y = n->y;
switch (sym->type)
{
case SYMBOLIZER_ICON:
make_bitmap_icon(v, (struct sym_icon *) sym);
+ r->x = ((struct sym_icon *)sym)->sir.x;
+ r->y = ((struct sym_icon *)sym)->sir.y;
break;
case SYMBOLIZER_POINT:
make_bitmap_point(v, (struct sym_point *) sym);
break;
+ case SYMBOLIZER_TEXT: ;
+ struct sym_text *st = (struct sym_text *) sym;
+ struct osm_node *n = (struct osm_node *) object;
+ make_bitmap_label(v, st);
default:
- // Oops :)
// FIXME
return;
}
- sym_plan(sym, zindex); // TEMPORARY
+ printf("Inited point to [%.2f; %.2f] on %u\n", r->x, r->y, r->zindex);
}
void labeller_add_line(struct symbol *sym, z_index_t zindex)
{
+printf("Adding line on %u\n", zindex);
struct buffer_line *b = GARY_PUSH(buffer_line);
b->line = (struct sym_line *) sym;
b->zindex = zindex;
sym_plan(sym, zindex);
}
-void labeller_add_arealabel(struct symbol *sym UNUSED, struct osm_object *o, z_index_t zindex)
+void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
{
+ if (o->type != OSM_TYPE_WAY)
+ {
+ // FIXME
+ return;
+ }
+
+ printf("[LAB] Labelling way %ju on %u\n", o->id, zindex);
+ struct buffer_linelabel *ll = GARY_PUSH(buffer_linelabel);
+ ll->way = (struct osm_way *) o;
+ ll->label = sym;
+ ll->zindex = zindex;
+}
+
+void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
+{
+printf("Adding area on %u\n", zindex);
struct request_area *r = GARY_PUSH(requests_area);
+
+ r->request.type = REQUEST_AREA;
+ r->request.ind = num_requests++;
+
r->o = (struct osm_multipolygon *) o;
r->zindex = zindex;
- ((struct request *)r)->ind = num_requests++;
+ r->label = sym;
+
+ osm_obj_center(o, &(r->cx), &(r->cy));
+
+ GARY_INIT(r->variants, 0);
+ struct point_variant *v = GARY_PUSH(r->variants);
+ switch (sym->type)
+ {
+ case SYMBOLIZER_ICON:
+ printf("DEBUG: Icon label\n");
+ make_bitmap_icon(v, (struct sym_icon *) sym);
+ break;
+ case SYMBOLIZER_TEXT:
+ printf("DEBUG: Text label\n");
+ make_bitmap_label(v, (struct sym_text *) sym);
+ default:
+ // FIXME
+ ;
+ }
}
void make_graph(void)
for (uns i=0; i<GARY_SIZE(buffer_line); i++)
{
struct osm_way *way = (struct osm_way *) buffer_line[i].line->s.o;
- struct graph_node *prev = NULL;
- struct osm_node *prev_node = NULL;
+ struct graph_node *g_prev = NULL;
+ struct osm_node *o_prev = NULL;
+
CLIST_FOR_EACH(struct osm_ref *, ref, way->nodes)
{
// FIXME: Shall osm_object's type be checked here?
- struct osm_node *node = (struct osm_node *) ref->o;
+ struct osm_node *o_node = (struct osm_node *) ref->o;
- struct graph_node *n = hash_find(ref->o->id);
- if (!n)
+ struct graph_node *g_node = hash_find(ref->o->id);
+ if (!g_node)
{
- n = hash_new(ref->o->id);
- GARY_INIT(n->edges, 0);
+ g_node = hash_new(ref->o->id);
+ GARY_INIT(g_node->edges, 0);
+ g_node->o = o_node;
+ g_node->id = ref->o->id;
+ g_node->num = num_nodes++;
}
- if (! prev)
+ if (! g_prev)
{
- prev = n;
- prev_node = node;
+ g_prev = g_node;
+ o_prev = o_node;
continue;
}
- struct graph_edge *e = (struct graph_edge *) mp_alloc(mp_edges, sizeof(struct graph_edge));
+ struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge)); num_edges_dbg++;
+ e->num = num_edges++;
e->id = buffer_line[i].line->s.o->id;
e->color = buffer_line[i].line->color;
- e->length = hypot(abs(prev_node->x - node->x), abs(prev_node->y - node->y));
- e->visited = 0;
+ e->length = hypot(abs(o_prev->x - o_node->x), abs(o_prev->y - o_node->y));
+ e->visited = -1;
e->prev = NULL;
e->next = NULL;
- e->n1 = prev;
- e->n2 = n;
- e->longline = -1;
- e->text = NULL;
- e->sym = buffer_line[i].line;
-
- struct graph_edge **edge = GARY_PUSH(prev->edges);
+ e->n1 = g_prev;
+ e->n2 = g_node;
+ e->longline = (uns) -1;
+ e->line = buffer_line[i].line;
+ e->dir = DIR_UNSET;
+ e->label = NULL;
+
+ struct graph_edge **edge = GARY_PUSH(g_prev->edges);
*edge = e;
- edge = GARY_PUSH(n->edges);
+ edge = GARY_PUSH(g_node->edges);
*edge = e;
+
+ g_prev = g_node;
+ o_prev = o_node;
}
}
+
+ printf("Made graph with %d edges\n", num_edges_dbg);
+}
+
+void dump_graph(void)
+{
+ HASH_FOR_ALL(hash, node)
+ {
+ printf("* Node: (%d) #%ju [%.2f; %.2f]\n", node->num, node->id, node->o->x, node->o->y);
+ for (uns i=0; i<GARY_SIZE(node->edges); i++)
+ {
+ struct graph_edge *e = node->edges[i];
+ printf("\t edge (%d) #%ju to ", e->num, e->id);
+ if (node->edges[i]->n1->id == node->id)
+ printf("(%d) #%ju [%.2f; %.2f]\n", e->n2->num, e->n2->id, e->n2->o->x, e->n2->o->y);
+ else if (node->edges[i]->n2->id == node->id)
+ printf("(%d) #%ju [%.2f; %.2f]\n", e->n1->num, e->n1->id, e->n1->o->x, e->n1->o->y);
+ else
+ printf("BEWARE! BEWARE! BEWARE!\n");
+
+ printf("\t\t");
+ if ((node->edges[i]->label)) printf("Labelled\n");
+ if ((node->edges[i]->label) && (node->edges[i]->label->type == SYMBOLIZER_TEXT)) printf(" labelled %s;", osm_val_decode(((struct sym_text *) node->edges[i]->label)->text));
+ printf(" colored %d;", node->edges[i]->color);
+ printf(" length %.2f", node->edges[i]->length);
+ printf("\n");
+ }
+ }
+ HASH_END_FOR;
}
void label_graph(void)
{
+printf("There are %u line labels requested\n", GARY_SIZE(buffer_linelabel));
for (uns i=0; 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));
CLIST_FOR_EACH(struct osm_ref *, ref, buffer_linelabel[i].way->nodes)
{
+ printf("Looking for node %ju\n", ref->o->id);
struct graph_node *n = hash_find(ref->o->id);
if (n == NULL)
{
}
else
{
+ 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 == ((struct osm_object *) buffer_linelabel[i].way)->id)
+ if (n->edges[j]->id == buffer_linelabel[i].way->o.id)
{
- n->edges[j]->text = buffer_linelabel[i].text;
+ printf("Labelling node %ju\n", n->id);
+ n->edges[j]->label = buffer_linelabel[i].label;
+ n->edges[j]->zindex = buffer_linelabel[i].zindex;
}
}
}
}
}
-void join_edge(struct graph_edge *e, int dir)
+
+
+/***
+* 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; i<GARY_SIZE(other_node->edges); 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; i<GARY_SIZE(node->edges); 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)
{
- struct graph_node *other_node = NULL;
- switch (dir)
+ ASSERT(dir < 3);
+ 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; i<GARY_SIZE(node->edges); i++)
{
- case 1:
- other_node = e->n2;
- break;
- case 2:
- other_node = e->n1;
- break;
- // FIXME: default?
+ 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;
+
+ if (! other->visited) {
+ struct graph_edge **e_ptr = GARY_PUSH(bfs_queue);
+ *e_ptr = other;
+ other->visited = 1;
+ }
+
+ 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 || (other->length > candidate->length))
+ candidate = other;
+ }
+ }
+
+ if (candidate)
+ {
+ 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)
+ {
+ 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);
+ }
}
+}
+void ya_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);
struct graph_edge *candidate = NULL;
- for (uns i=0; i<GARY_SIZE(other_node->edges); i++)
+
+ for (uns i=0; i<GARY_SIZE(node->edges); 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];
+ 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 (other->visited != e->longline) {
+ printf("Pushing new edge %d / %ju\n", other->num, other->id);
+ struct graph_edge **e_ptr = GARY_PUSH(bfs_queue);
+ *e_ptr = other;
+ other->visited = e->longline;
}
- //if (1) // FIXME: same labels but not the same edge
- if ((!other->visited) && (e->text) && (other->text) && (e->text->text == other->text->text))
+ if (((other->n1->id == node->id) && (other->n2->id == anode->id)) ||
+ ((other->n2->id == node->id) && (other->n1->id == anode->id)))
+ continue;
+
+ if (((other->n1->id == node->id) || (other->n2->id == node->id)) &&
+ (e->label) && (other->label) &&
+ (e->label->type == SYMBOLIZER_TEXT) && (other->label->type == SYMBOLIZER_TEXT) &&
+ (((struct sym_text *) e->label)->text == ((struct sym_text *) other->label)->text))
{
- if (e->color == other_node->edges[i]->color)
+ if (! candidate || (other->length > candidate->length))
+ candidate = other;
+ }
+ }
+
+ if (candidate)
+ {
+printf("New line in longline %u\n", e->longline);
+ struct graph_edge *other = candidate;
+ other->longline = e->longline;
+ other->dir = dir;
+ if (((dir == DIR_BWD) && (other->n1->id == node->id)) ||
+ ((dir == DIR_FWD) && (other->n2->id == node->id)))
{
- if ((!candidate) || (candidate->length < other->length))
- {
- candidate = other;
- }
+ struct graph_node *swp = other->n2;
+ other->n2 = other->n1;
+ other->n1 = swp;
}
- else
+
+ switch (dir)
{
- // Beware: Name conflict here
+ case DIR_BWD:
+ e->prev = other;
+ other->next = e;
+ longlines[other->longline].first = other;
+ break;
+ case DIR_FWD:
+ e->next = other;
+ other->prev = e;
+ break;
+ default:
+ printf("Oops\n");
+ ASSERT(0);
}
- }
}
+}
- if (candidate)
+void bfs(void)
+{
+ for (uns i=0; i<GARY_SIZE(bfs_queue); i++)
{
- candidate->longline = e->longline;
- if (dir == 1)
+ struct graph_edge *cur = bfs_queue[i];
+ printf("Exploring new edge, %d\n", cur->num);
+ //ASSERT(! cur->visited);
+
+ cur->visited = 1;
+ if (cur->longline == (uns) -1)
{
- if (candidate->n2 != e->n1)
- {
- candidate->n1 = candidate->n2;
- candidate->n2 = e->n1;
- }
- e->prev = candidate;
- candidate->next = e;
+ GARY_PUSH(longlines);
+ cur->longline = num_longlines++;
+ longlines[cur->longline].first = cur;
+ }
+
+ if (!cur->anode)
+ {
+ bfs_edge(cur, cur->n1, cur->n2, 1);
+ bfs_edge(cur, cur->n2, cur->n1, 2);
+ }
+ else
+ {
+ bfs_edge(cur, cur->anode, cur->bnode, cur->dir);
+ }
+ }
+}
+
+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; 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));
+ //ASSERT(! cur->visited);
+
+ cur->visited = longline;
- longlines[e->longline].first = candidate;
+ 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
{
- if (candidate->n1 != e->n2)
+ switch (cur->dir)
{
- candidate->n2 = candidate->n1;
- candidate->n1 = e->n2;
+ 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
+ ;
}
- e->next = candidate;
- candidate->prev = e;
}
}
}
-void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex)
+void bfs_wrapper(void)
{
- struct buffer_linelabel *ll = GARY_PUSH(buffer_linelabel);
- ll->way = (struct osm_way *) o;
- ll->text = (struct sym_text *) sym;
- ll->zindex = zindex;
+ GARY_INIT(bfs_queue, 0);
+ GARY_INIT(longlines, 0);
+
+ HASH_FOR_ALL(hash, node)
+ {
+ for (uns i=0; i<GARY_SIZE(node->edges); i++)
+ {
+ if (! node->edges[i]->visited)
+ {
+ printf("Running new BFS\n");
+ GARY_RESIZE(bfs_queue, 0);
+ struct graph_edge **e = GARY_PUSH(bfs_queue);
+ *e = node->edges[i];
+ bfs();
+ //dump_longlines();
+ printf("Joined %d edges\n", dbg_num_hits); dbg_num_hits = 0;
+ printf("Planned %u edges\n", GARY_SIZE(bfs_queue));
+ }
+ }
+ }
+ HASH_END_FOR;
+
+ GARY_FREE(bfs_queue);
}
-void bfs(void)
+void ya_bfs_wrapper(void)
{
GARY_INIT(bfs_queue, 0);
GARY_INIT(longlines, 0);
{
for (uns i=0; i<GARY_SIZE(node->edges); i++)
{
- struct graph_edge *e = node->edges[i];
-
- if (e->visited) HASH_CONTINUE;
- if (e->longline == (uns) -1)
+ if ((node->edges[i]->label) && (node->edges[i]->longline == (uns) -1))
{
GARY_PUSH(longlines);
- e->longline = num_longlines++;
- longlines[e->longline].first = e;
+ 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;
+
+ 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; i<GARY_SIZE(node->edges); i++)
+* {
+* struct graph_edge *e = node->edges[i];
+*
+* if (e->visited) continue;
+*
+* // BFS itself
+* for (uns i1=0; i1<GARY_SIZE(e->n1->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; i2<GARY_SIZE(e->n2->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; i<GARY_SIZE(longlines); i++)
+ {
+printf("Longline %u:", i);
+ struct graph_edge *e = longlines[i].first;
+if ((e->label) && (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<GARY_SIZE(longlines); i++)
+ {
+ struct graph_edge *e = longlines[i].first;
+
+ 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 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 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 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);
+ ASSERT(0);
}
+ e = e->next;
+ }
+ }
+}
+
+void make_segments_new(void)
+{
+ for (uns i=0; i<GARY_SIZE(longlines); i++)
+ {
+ // Skip lines which are not labelled
+ if (! (longlines[i].first && longlines[i].first->label))
+ 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;
- e->visited = 1;
+ struct sym_text *st = NULL;
+ if (e->label->type == SYMBOLIZER_TEXT)
+ {
+ st = (struct sym_text *) e->label;
+ }
+ else
+ {
+ continue;
+ // FIXME;
+ }
- if (! e->prev)
+ while (e)
+ {
+ if ((cur_length + e->length > conf_max_section_length) &&
+ !(cur_length + e->length < conf_max_section_overlay))
{
- join_edge(e, 1);
+ 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->next)
+
+ if (e->length < st->tw)
{
- join_edge(e, 2);
+ 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;
}
}
- HASH_END_FOR;
-
- GARY_FREE(bfs_queue);
}
void make_segments(void)
{
- GARY_INIT(requests_line, 0);
-
+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->x1 = ((struct osm_node *) e->n1)->x;
- r->y1 = ((struct osm_node *) e->n1)->y;
- r->x2 = ((struct osm_node *) e->n2)->x;
- r->y2 = ((struct osm_node *) e->n2)->y;
- r->sym = e->sym;
+
+ r->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
- ((struct request *)r)->ind = num_requests++;
- 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;
}
}
}
+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_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; i<page_height_int; i++)
+ for (int j=0; j<page_width_int; j++)
+ bitmap[i*page_width_int + j] = 0;
+
+ for (uns i=0; i<GARY_SIZE(individual->placements); 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; i<page_height_int; i++)
+ {
+ for (int j=0; j<page_width_int; j++)
+ {
+ fprintf(fd_dump, "%d", bitmap[(int) (i*page_width_int + j)] ? 1 : 0);
+ }
+ fprintf(fd_dump, "\n");
+ }
+ fclose(fd_dump);
+}
+
+void dump_individual(struct individual *individual)
+{
+printf("(There are %d requests)\n", num_requests);
+ for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+ {
+ struct placement *p = &(individual->placements[i]);
+
+ switch (p->request->type)
+ {
+ case REQUEST_POINT:
+ printf("Point at [%.2f; %.2f] on %u\n", p->x, p->y, ((struct request_point *) p->request)->zindex);
+ break;
+ case REQUEST_LINE: ;
+ struct request_line *rl = (struct request_line *) p->request;
+ print_label(rl->segments[0].label);
+ break;
+ 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 ");
+ 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);
+}
+
void labeller_label(void)
{
make_graph();
label_graph();
- bfs();
- make_segments();
+dump_graph();
+ ya_bfs_wrapper();
+dump_longlines();
+ 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));
+ GARY_INIT(population1, conf_pop_size);
+ GARY_INIT(population2, conf_pop_size);
make_population();
+ printf("Dealing with %d requests\n", num_requests);
+
+/*
while (! shall_terminate())
{
- // sort population by fitness
- // alloc new population
+ iteration++;
+
+ struct individual **swp = population1;
+ population1 = population2;
+ population2 = swp;
+ pop2_ind = 0;
+ }
+*/
+
+ dump_individual(population1[0]);
+dump_bitmaps(population1[0]);
+
+ for (uns i=0; i<GARY_SIZE(population1[0]->placements); 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: ;
+ 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++;
+
breed();
mutate();
elite();
rank_population();
+ // sort population by fitness
+
+ struct individual **swp = population1;
+ population1 = population2;
+ printf("Swapped populations\n");
+ population2 = swp;
+ // GARY_RESIZE(population2, 0) -- is it needed?
+ pop2_ind = 0;
}
}
void make_population(void)
{
- GARY_INIT(population1, 0);
for (int i=0; i<conf_pop_size; i++)
{
- struct individual *individual = ep_alloc(ep_individuals);
- struct individual **ind = GARY_PUSH(population1);
- *ind = individual;
- GARY_INIT(individual->map, 0);
- GARY_INIT(individual->placements, 0);
+ printf("Making individual %d\n", i);
+ struct individual *individual = ep_alloc(ep_individuals); init_individual(individual);
+ population1[i] = individual;
+ int p = 0;
for (uns j=0; j<GARY_SIZE(requests_point); j++)
{
- struct placement *p = GARY_PUSH(individual->placements);
- init_placement(p, (struct request *) &requests_point[i]);
+ init_placement(&(individual->placements[p++]), (struct request *) &requests_point[j]);
}
for (uns j=0; j<GARY_SIZE(requests_line); j++)
{
- struct placement *p = GARY_PUSH(individual->placements);
- init_placement(p, (struct request *) &requests_line[i]);
+ init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j]);
+ for (uns k=0; k<GARY_SIZE(requests_line[j].segments); k++)
+ {
+ init_placement(&(individual->placements[p++]), (struct request *) &requests_line[j].segments[k]);
+ }
}
for (uns j=0; j<GARY_SIZE(requests_area); j++)
{
- struct placement *p = GARY_PUSH(individual->placements);
- init_placement(p, (struct request *) &requests_area[i]);
+ init_placement(&(individual->placements[p++]), (struct request *) &requests_area[j]);
}
+
+ ASSERT(p == num_requests);
}
}
printf("%.2f\n", ((double) conf_breed_pop_size_perc/100));
int conf_breed_pop_size = ((double) conf_breed_pop_size_perc/100) * conf_pop_size;
struct individual **breed_buffer;
- while (i < conf_breed_rbest_perc * conf_pop_size)
+ while (i < conf_breed_pop_size)
{
+ printf("%d < %d, breeding\n", i, conf_breed_pop_size);
int parent1 = randint(1, conf_breed_pop_size);
int parent2 = randint(1, conf_breed_pop_size);
printf("Will breed %d and %d, chosen of %d best of %d population (intended to be %d)\n", parent1, parent2, conf_breed_pop_size, GARY_SIZE(population1), conf_pop_size);
breed_buffer = perform_crossover(population1[parent1], population1[parent2]);
- population2[2*i] = breed_buffer[0];
- population2[2*i+1] = breed_buffer[1];
+ population2[pop2_ind++] = breed_buffer[0];
+ population2[pop2_ind++] = breed_buffer[1];
free(breed_buffer);
+ i++;
}
acc += conf_breed_rbest_perc;
+ return; // FIXME: DEBUG HACK
+
int remaining = (1 - acc) * (conf_pop_size * conf_breed_perc);
int step = remaining / conf_pop_size;
for (; i<conf_pop_size; i += 2)
{
- breed_buffer = perform_crossover(population1[i*step], population1[i*(step+1)]);
- population2[2*i] = breed_buffer[0];
- population2[2*i+1] = breed_buffer[1];
+ printf("Asking for %d and %d of %d\n", i*step, i*(step+1), conf_pop_size);
+ breed_buffer = perform_crossover(population1[i*step], population1[i*step+1]);
+ population2[pop2_ind++] = breed_buffer[0];
+ population2[pop2_ind++] = breed_buffer[1];
}
// FIXME: Could there be one missing individual?
struct individual **perform_crossover(struct individual *parent1, struct individual *parent2)
{
struct individual **buffer = malloc(2*sizeof(struct individual));
- struct individual *child1 = ep_alloc(ep_individuals);
- struct individual *child2 = ep_alloc(ep_individuals);
- GARY_INIT(child1->placements, 0);
- GARY_INIT(child2->placements, 0);
+ struct individual *child1 = ep_alloc(ep_individuals); init_individual(child1);
+ struct individual *child2 = ep_alloc(ep_individuals); init_individual(child2);
printf("Performing crossover\n");
for (uns i=0; i<GARY_SIZE(parent1->placements); i++)
{
- printf("%dth placement\n", i);
+ printf("%dth placement out of %d\n", i, num_requests);
if (! parent1->placements[i].processed)
{
- struct placement **clos_symbols;
- GARY_INIT(clos_symbols, 0);
- get_closure(clos_symbols, &(parent1->placements[i]), parent1, parent2);
+ struct placement **clos_symbols = get_closure(&(parent1->placements[i]), parent1, parent2);
int x = randint(1, 2);
if (x == 1)
copy_symbols(clos_symbols, parent2, child1);
copy_symbols(clos_symbols, parent1, child2);
}
- printf("%lld\n", GARY_SIZE(clos_symbols));
+ printf("Symbols copied; %lld\n", GARY_SIZE(clos_symbols));
GARY_FREE(clos_symbols);
}
while (i < conf_mutate_rbest_perc * conf_pop_size)
{
int ind = randint(1, conf_mutate_pop_size);
- population2[pop2_ind] = population1[ind];
+ copy_individual(population2[pop2_ind], population1[ind]);
perform_mutation(population2[pop2_ind]);
+ pop2_ind++;
}
}
{
for (int i=0; i<conf_elite_perc * conf_pop_size; i++)
{
- population2[pop2_ind] = population1[0];
+ population2[pop2_ind++] = population1[0];
}
}
{
case REQUEST_POINT:
gen_coords_point(p);
+ 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:
+ 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)
int randint(int min, int max)
{
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)));
+ //printf("Returning %d + (%d %% (%d - %d)) = %d + %d %% %d = %d + %d = %d\n", min, r, max, min, min, r, max-min, min, r%(max-min), min+(r%(max-min)));
return min + (r % (max - min));
return (r * (max - min));
}
-void get_closure(struct placement **closure UNUSED, struct placement *placement UNUSED, struct individual *parent1 UNUSED, struct individual *parent2 UNUSED)
+struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2 UNUSED)
{
printf("Getting closure\n");
+ struct placement **closure;
+ GARY_INIT(closure, 0);
bool *chosen = malloc(GARY_SIZE(parent1->placements) * sizeof(bool));
chosen[placement->request->ind] = 1;
GARY_FREE(overlapping);
first++;
}
+
+ return closure;
}
void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child)
{
- printf("%.2f\n", child->penalty);
+ //printf("%d\n", child->penalty);
+ //printf("Closure size: %lld\n", GARY_SIZE(closure));
for (uns i=0; i<GARY_SIZE(closure); i++)
{
int ind = closure[i]->request->ind;
child->placements[ind] = parent->placements[ind];
+ child->placements[ind].processed = 0;
}
}
{
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);
}
}
// FIXME
p->request = r;
p->processed = 0;
+ p->x = p->y = 0; // To prevent valgrind from complaining
+ switch (r->type)
+ {
+ case REQUEST_POINT: ;
+ struct request_point *rp = (struct request_point *) r;
+ p->x = rp->x;
+ p->y = rp->y;
+ break;
+ case REQUEST_LINE: ;
+ break;
+ case REQUEST_SECTION: ;
+ struct request_section *rls = (struct request_section *) r;
+ p->variant_used = randint(0, rls->num_segments);
+ break;
+ case REQUEST_SEGMENT: ;
+ struct request_segment *rs = (struct request_segment *) r;
+ p->x = rs->x2;
+ p->y = rs->y2;
+ break;
+ case REQUEST_AREA: ;
+ struct request_area *ra = (struct request_area *) r;
+ p->x = ra->cx;
+ p->y = ra->cy;
+ p->variant_used = 0;
+ break;
+ default:
+ ASSERT(p->request->type != REQUEST_INVALID);
+ printf("Valid request: %d\n", p->request->type);
+ ASSERT(0);
+ }
+
+ gen_coords(p);
+ printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
+}
+
+void init_individual(struct individual *i)
+{
+//printf("Initing individual\n");
+ GARY_INIT(i->placements, num_requests);
+ GARY_INIT(i->map, 0);
+ i->penalty = 0; // FIXME
}
struct placement **get_overlapping(struct placement *p UNUSED)
{
struct placement **buffer;
GARY_INIT(buffer, 0);
-return buffer; }
+ return buffer;
+}
void filter(struct placement **list UNUSED, bool *pred UNUSED)
{
// FIXME: How the hell shall double in range <0, 1> be generated? O:)
return 0.5;
}
+
+void cleanup(void)
+{
+ hash_cleanup();
+ GARY_FREE(requests_point);
+ GARY_FREE(requests_line);
+ GARY_FREE(requests_area);
+}
+
+void copy_individual(struct individual *src, struct individual *dest)
+{
+ src->penalty = dest->penalty;
+ GARY_INIT(dest->placements, GARY_SIZE(src->placements));
+ for (uns i=0; i<GARY_SIZE(src->placements); i++)
+ {
+ dest->placements[i] = src->placements[i];
+ }
+}
projects / leo.git / blobdiff