-#include <errno.h>
-
#include <ucw/lib.h>
#include <ucw/gary.h>
#include <ucw/mempool.h>
#include <stdlib.h>
#include <math.h>
#include <fcntl.h>
+#include <limits.h>
#define BLOCK_SIZE 4096
-//struct mempool *mpool_requests;
-
static struct request_point *requests_point;
static struct request_line *requests_line;
static struct request_area *requests_area;
struct individual **population1;
struct individual **population2;
-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 dbg_overlaps = 0;
-int dbg_rank = 0;
-int dbg_evolution = 0;
-int dbg_mutation = 0;
+int dbg_segments = VERBOSITY_NONE;
+int dbg_plan = VERBOSITY_NONE;
+int dbg_requests = VERBOSITY_NONE;
+int dbg_graph = VERBOSITY_NONE;
+int dbg_bfs = VERBOSITY_NONE;
+int dbg_map_parts = VERBOSITY_NONE;
+int dbg_movement = VERBOSITY_NONE;
+int dbg_init = VERBOSITY_NONE;
+int dbg_overlaps = VERBOSITY_NONE;
+int dbg_rank = VERBOSITY_NONE;
+int dbg_evolution = VERBOSITY_INDIVIDUAL;
+int dbg_mutation = VERBOSITY_NONE;
+int dbg_breeding = VERBOSITY_NONE;
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_fit_size = 1;
int conf_penalty_bound = 0;
int conf_stagnation_bound = 0;
-int conf_iteration_limit = 4;
+int conf_iteration_limit = 100;
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; // Percentage of new pop created by breeding
+double conf_breed_pop_size = 0.4;
+double conf_breed_rbest = 0.2;
+
+int breed_pop_size;
+int breed_rbest_size;
bool conf_mutate_children = 1;
-double conf_mutate_children_prob = 0.3;
+double conf_mutate_children_prob = 1.0;
-double conf_mutate_rbest = 1;
-double conf_mutate_pop_size = 0.9;
+double conf_mutate_pop_size = 0.4;
+double conf_mutate_rbest = 0.2;
-double conf_mutate_move_bound = 1.0;
+double conf_mutate_move_bound = 0.1;
double conf_mutate_regen_bound = 0.0;
double conf_mutate_chvar_bound = 0.0;
int mutate_pop_size;
int mutate_rbest_size;
-double conf_elite_pop_size = 0.1;
+double conf_elite_pop_size = 0.2;
int elite_pop_size;
double conf_max_section_length = 100;
double conf_max_section_overlay = 10;
-int old_best = 0; // FIXME: Shall be int max
+int old_best = INT_MAX;
int iteration = 0;
int pop2_ind;
-int conf_part_size = 50;
-
+// In milimeters
int move_min = 0;
-int move_max = 1;
+int move_max = 5;
int num_requests = 0;
int num_placements = 0;
+// In milimeters
int conf_map_part_width = 5;
int conf_map_part_height = 5;
-int num_map_parts_row;
-int num_map_parts_col;
-int num_map_parts;
-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);
+uns num_map_parts_row;
+uns num_map_parts_col;
+uns num_map_parts;
-int overlaps(struct placement *p1, struct placement *p2);
-int get_overlap(struct placement *p);
-int individual_overlap(struct individual *individual);
+void compute_sizes(void);
void make_population(void);
bool shall_terminate(void);
void rank_population(void);
void plan_individual(struct individual *individual);
+int overlaps(struct placement *p1, struct placement *p2);
+int get_overlap(struct placement *p);
+int individual_overlap(struct individual *individual);
+
+double get_distance(struct placement *p);
+double individual_distances(struct individual *individual);
+
+struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
+void perform_mutation(struct individual *individual);
+void init_placement(struct placement *p, struct individual *individual, struct request *r);
+void init_individual(struct individual *i);
+void copy_individual(struct individual *src, struct individual *dest);
int cmp_individual(const void *a, const void *b);
+void clear_individual(struct individual *individual);
+void clear_population(struct individual **pop);
+
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);
-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 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);
-void dump_penalties(struct individual **population);
-
double gen_movement(void);
double gen_movement_uniform(void);
+void move_symbol(struct placement *p);
+void move_symbol_point(struct placement *p);
+void move_symbol_segment(struct placement *p);
+void hide_segment_labels(struct individual *individual);
+
void gen_coords(struct placement *p);
void gen_coords_point(struct placement *p);
void gen_coords_segment(struct placement *p);
struct map_part **get_map_parts(struct placement *p);
void update_map_parts(struct placement *p);
+struct placement **get_closure(struct placement *placement);
+void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child, bool **processed_ptr);
+struct placement **get_overlapping(struct placement *p);
+struct placement **filter(struct placement **list, bool **pred_ptr);
-void make_segments_old(void);
-void labeller_cleanup(void);
+void make_graph(void);
+void label_graph(void);
+void bfs_wrapper(void);
+void bfs(uns longline);
+void bfs_edge(struct graph_edge *e, struct graph_node *node, struct graph_node *anode, enum edge_dir dir);
+void make_segments(void);
-struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
-void perform_mutation(struct individual *individual);
+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 hide_segment_labels(struct individual *individual);
-void init_placement(struct placement *p, struct individual *individual, struct request *r);
-void init_individual(struct individual *i);
-struct map_part **get_parts(struct placement *symbol, struct individual *individual);
+void dump_bitmaps(struct individual *individual);
+void dump_graph(void);
+void dump_longlines(void);
+void dump_linelabel_requests(void);
+void dump_individual(struct individual *individual);
+void dump_label(struct symbol *sym);
+void dump_penalties(struct individual **population);
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);
-void move_symbol_segment(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);
return min2(min2(a, b), min2(c, d));
}
-void print_label(struct symbol *sym)
+void dump_label(struct symbol *sym)
{
switch (sym->type)
{
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);
-
- num_map_parts_row = (page_width_int + conf_map_part_width) / conf_map_part_width;
- num_map_parts_col = (page_height_int + conf_map_part_height) / conf_map_part_height;
- num_map_parts = num_map_parts_row * num_map_parts_col;
+ compute_sizes();
}
void make_bitmap(struct variant *v, struct symbol *sym)
{
+ v->offset_x = v->offset_y = 0;
+
switch (sym->type)
{
case SYMBOLIZER_POINT:
void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex)
{
- if (dbg_requests)
+ if (dbg_requests >= VERBOSITY_PLACEMENT)
printf("Adding point\n");
if (object->type != OSM_TYPE_NODE)
{
struct osm_node *n = (struct osm_node *) object; // FIXME: Compiler warning
r->x = n->x;
r->y = n->y;
+ make_bitmap(v, sym);
switch (sym->type)
{
case SYMBOLIZER_ICON:
- make_bitmap_icon(v, (struct sym_icon *) sym);
+ // FIXME: Really?
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:
// FIXME
return;
}
-// printf("Inited point to [%.2f; %.2f] on %u\n", r->x, r->y, r->zindex);
+ if (dbg_requests >= VERBOSITY_PLACEMENT)
+ 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)
{
- if (dbg_requests)
+ if (dbg_requests >= VERBOSITY_PLACEMENT)
printf("Adding line on %u\n", zindex);
struct buffer_line *b = GARY_PUSH(buffer_line);
b->line = (struct sym_line *) sym;
{
if (o->type != OSM_TYPE_WAY)
{
- // FIXME
+ printf("Linelabel request on object which is not way\n");
return;
}
- if (dbg_requests)
- printf("[LAB] Labelling way %ju on %u\n", o->id, zindex);
+ if (dbg_requests >= VERBOSITY_PLACEMENT)
+ printf("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)
{
- if (dbg_requests)
+ if (dbg_requests >= VERBOSITY_PLACEMENT)
printf("Adding area on %u\n", zindex);
struct request_area *r = GARY_PUSH(requests_area);
GARY_INIT(r->request.variants, 0);
struct variant *v = GARY_PUSH(r->request.variants);
- switch (sym->type)
- {
- case SYMBOLIZER_ICON:
- if (dbg_requests)
- printf("DEBUG: Icon label\n");
- make_bitmap_icon(v, (struct sym_icon *) sym);
- break;
- case SYMBOLIZER_TEXT:
- if (dbg_requests)
- printf("DEBUG: Text label\n");
- make_bitmap_label(v, (struct sym_text *) sym);
- default:
- // FIXME
- ;
- }
+ make_bitmap(v, sym);
}
void make_graph(void)
hash_init();
struct mempool *mp_edges = mp_new(BLOCK_SIZE);
- printf("Extracting nodes, will iterate over %lld ways\n", GARY_SIZE(buffer_line));
+ if (dbg_graph >= VERBOSITY_GENERAL)
+ printf("Extracting nodes, will iterate over %lld ways\n", GARY_SIZE(buffer_line));
for (uns i=0; i<GARY_SIZE(buffer_line); i++)
{
struct osm_way *way = (struct osm_way *) buffer_line[i].line->s.o;
continue;
}
- struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge)); num_edges_dbg++;
+ struct graph_edge *e = mp_alloc(mp_edges, sizeof(struct graph_edge));
e->num = num_edges++;
e->id = buffer_line[i].line->s.o->id;
e->color = buffer_line[i].line->color;
o_prev = o_node;
}
}
-
- printf("Made graph with %d edges\n", num_edges_dbg);
}
void dump_graph(void)
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");
+ {
+ // This shouldn't ever happen
+ printf("BEWARE! Edge is associated with a node it doesn't belongs to!\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));
+ else if ((node->edges[i]->label)) printf("Labelled\n");
+
printf(" colored %d;", node->edges[i]->color);
printf(" length %.2f", node->edges[i]->length);
printf("\n");
void label_graph(void)
{
- if (dbg_graph)
+ if (dbg_graph >= VERBOSITY_GENERAL)
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)
- if (dbg_graph)
+ if (dbg_graph >= VERBOSITY_INDIVIDUAL)
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)
{
- if (dbg_graph)
+ if (dbg_graph >= VERBOSITY_PLACEMENT)
printf("Looking for node %ju\n", ref->o->id);
struct graph_node *n = hash_find(ref->o->id);
if (n == NULL)
{
- // FIXME: What shall be done?
+ printf("BEWARE! Requested node couldn't be found.\n");
}
else
{
- if (dbg_graph)
+ if (dbg_graph >= VERBOSITY_ALL)
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)
{
- if (dbg_graph)
+ if (dbg_graph >= VERBOSITY_ALL)
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)
{
- if (dbg_bfs)
+ if (dbg_bfs >= VERBOSITY_PLACEMENT)
printf("BFS edge called for edge %d (going %d) in direction %d\n", e->num, e->dir, dir);
struct graph_edge *candidate = NULL;
if ((other->longline != (uns) -1) && (other->longline != e->longline)) continue;
if ((uns) other->visited != e->longline) {
- if (dbg_bfs)
+ if (dbg_bfs >= VERBOSITY_PLACEMENT)
printf("Pushing new edge %d / %ju\n", other->num, other->id);
struct graph_edge **e_ptr = GARY_PUSH(bfs_queue);
*e_ptr = other;
if (candidate)
{
- if (dbg_bfs)
+ if (dbg_bfs >= VERBOSITY_PLACEMENT)
printf("New line in longline %u\n", e->longline);
struct graph_edge *other = candidate;
other->longline = e->longline;
void bfs(uns longline)
{
-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));
+ if (dbg_bfs >= VERBOSITY_INDIVIDUAL)
+ {
+ 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];
- if (dbg_bfs)
+ if (dbg_bfs >= VERBOSITY_PLACEMENT)
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];
- if (dbg_bfs)
+
+ if (dbg_bfs >= VERBOSITY_INDIVIDUAL)
+ {
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();
- if (dbg_bfs)
+
+ if (dbg_bfs >= VERBOSITY_INDIVIDUAL)
+ {
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++;
}
}
void dump_longlines(void)
{
-printf("*** Longlines dump\n");
+ printf("*** Longlines dump\n");
for (uns i=0; i<GARY_SIZE(longlines); i++)
{
-printf("Longline %u:", 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");
+ if ((e->label) && (e->label->type == SYMBOLIZER_TEXT))
+ printf(" labelled %s", osm_val_decode(((struct sym_text *) e->label)->text));
+ printf("\n");
while (e)
{
void cut_edge(struct graph_edge *e, double dist)
{
- if (dbg_segments)
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
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;
- // FIXME? Create new label for new edge, don't only copy pointer?
+ switch (e->label->type)
+ {
+ case SYMBOLIZER_TEXT:
+ new->label = malloc(sizeof(struct sym_text));
+ *((struct sym_text *) new->label) = *((struct sym_text *) e->label);
+ break;
+ default:
+ ;
+ }
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");
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
+ printf("Won't cut point\n");
return;
}
}
else
{
- if (dbg_segments)
+ // FIXME: Should other label types be supported in future?
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
printf("Warning: Skipping line\n");
continue;
- // FIXME;
}
- if (dbg_segments)
+ if (dbg_segments >= VERBOSITY_INDIVIDUAL)
printf("New longline\n");
+
while (e)
{
if (e->visited < 0)
{
- printf("BEWARE: Edge cycle\n");
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
+ printf("BEWARE: Edge cycle\n");
break;
}
- e->visited = -1; // FIXME
+ e->visited = -1;
- if (dbg_segments)
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
printf("Taking edge from [%.2f; %.2f] to [%.2f; %.2f] of length %.2f\n", e->n1->o->x, e->n1->o->y, e->n2->o->x, e->n2->o->y, e->length);
if (st && (e->length < st->tw))
{
e = e->next;
- //printf("Warning: Skipping segment\n");
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
+ printf("Warning: Skipping segment\n");
continue;
}
if (cur_length + e->length > conf_max_section_length + conf_max_section_overlay)
{
- if (dbg_segments)
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
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);
// HACK to prevent cutting to 0 lenght
cut_edge(e, max2(conf_max_section_length - cur_length, 2));
cur_length += e->length;
if (cur_length > conf_max_section_length)
{
- if (dbg_segments)
+ if (dbg_segments >= VERBOSITY_PLACEMENT)
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);
rls = make_new_section(request);
if (request->sections[0].num_segments == 0)
{
- // FIXME
- printf("WARNING: 0 segment section\n");
+ if (dbg_segments >= VERBOSITY_INDIVIDUAL)
+ printf("WARNING: Longline without any segment, skipped\n");
+
+ struct request_section *rls = &request->sections[0];
+ GARY_FREE(rls->segments);
+ GARY_FREE(rls->request.variants);
+
+ struct request_line *rl = &requests_line[GARY_SIZE(requests_line)-1];
+ GARY_FREE(rl->sections);
+ GARY_FREE(rl->request.variants);
+
GARY_POP(requests_line);
num_requests -= 2;
}
{
if (requests_line[i].sections[0].num_segments == 0)
{
- printf("HEY!\n");
+ if (dbg_segments >= VERBOSITY_INDIVIDUAL)
+ printf("Beware: Longline without any segment\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);
+ dump_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 (int j=0; j<page_width_int; j++)
bitmap[i*page_width_int + j] = 0;
+ int total = 0;
for (uns i=0; i<GARY_SIZE(individual->placements); i++)
{
if (individual->placements[i].variant_used == -1) continue;
{
for (int col = max2(p->x, 0); col < min2(p->x + v->width, page_width_int); col++)
{
+ if (bitmap[row * page_width_int + col] == 1) total += 1;
bitmap[row * page_width_int + col] = 1;
}
}
}
+ if (dbg_overlaps >= VERBOSITY_GENERAL)
+ printf("There were %d collisions during bitmap dump\n", total);
- 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);
fprintf(fd_dump, "\n");
}
fclose(fd_dump);
+
+ free(bitmap);
}
void dump_individual(struct individual *individual)
{
-printf("*** Dumping INDIVIDUAL ***\n");
-printf("(There are %d requests)\n", num_requests);
+ printf("*** Individual dump\n");
+ printf("(There are %d requests)\n", num_requests);
+
for (uns i=0; i<GARY_SIZE(individual->placements); i++)
{
struct placement *p = &(individual->placements[i]);
case REQUEST_LINE: ;
struct request_line *rl = (struct request_line *) p->request;
printf("Line: ");
- print_label(rl->sections[0].segments[0].label);
+ dump_label(rl->sections[0].segments[0].label);
break;
case REQUEST_SECTION: ;
printf("*");
case REQUEST_AREA: ;
struct request_area *ra = (struct request_area *) p->request;
printf("Area label ");
- print_label(ra->label);
+ dump_label(ra->label);
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);
}
}
continue;
}
-if (dbg_plan)
- printf("Will plan symbol at [%.2f; %.2f] on %u\n", individual->placements[i].x, individual->placements[i].y, zindex);
+ if (dbg_plan >= VERBOSITY_PLACEMENT)
+ printf("Will plan symbol at [%.2f; %.2f] on %u\n", individual->placements[i].x, individual->placements[i].y, zindex);
if (s) switch (s->type)
{
st->x = individual->placements[i].x;
st->y = individual->placements[i].y;
st->next_duplicate = NULL;
- if (dbg_plan) printf("Planning text %s at [%.2f; %.2f] on %u, with rotation %.2f\n", osm_val_decode(st->text), st->x, st->y, zindex, st->rotate);
+ if (dbg_plan >= VERBOSITY_PLACEMENT)
+ printf("Planning text %s at [%.2f; %.2f] on %u, with rotation %.2f\n", osm_val_decode(st->text), st->x, st->y, zindex, st->rotate);
sym_plan((struct symbol *) st, zindex);
break;
default:
}
}
-void labeller_label(void)
+void compute_sizes(void)
{
- make_graph();
- label_graph();
- bfs_wrapper();
- make_segments();
-
-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();
- rank_population();
- qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
+ page_width_int = floor(page_width);
+ page_height_int = floor(page_height);
- if (dbg_evolution)
- dump_penalties(population1);
+ num_map_parts_row = (page_width_int + conf_map_part_width) / conf_map_part_width;
+ num_map_parts_col = (page_height_int + conf_map_part_height) / conf_map_part_height;
+ num_map_parts = num_map_parts_row * num_map_parts_col;
- printf("Dealing with %d requests\n", num_requests);
+ breed_pop_size = conf_breed_pop_size * conf_pop_size;
+ breed_rbest_size = conf_breed_rbest * conf_pop_size;
+ if (dbg_evolution >= VERBOSITY_GENERAL)
+ {
+ printf("Breeding parameters:\n");
+ printf(" %d individuals are created\n", breed_pop_size);
+ printf(" %d best individuals in old population are considered\n", breed_rbest_size);
+ }
mutate_pop_size = conf_mutate_pop_size * conf_pop_size;
mutate_rbest_size = conf_mutate_rbest * conf_pop_size;
- if (dbg_evolution)
+ if (dbg_evolution >= VERBOSITY_GENERAL)
{
printf("Mutation parameters:\n");
printf(" %d individuals are created\n", mutate_pop_size);
}
elite_pop_size = conf_elite_pop_size * conf_pop_size;
- if (dbg_evolution)
+ if (dbg_evolution >= VERBOSITY_GENERAL)
{
printf("Elitism parameters:\n");
printf(" %d best individuals are copied\n", elite_pop_size);
}
+ if (breed_pop_size + mutate_pop_size + elite_pop_size != conf_pop_size)
+ {
+ if (conf_fit_size)
+ {
+ elite_pop_size += conf_pop_size - (breed_pop_size + mutate_pop_size + elite_pop_size);
+ }
+ else
+ {
+ fprintf(stderr, "Breeding + mutation + elitism won't create correct number of individuals\n");
+ fprintf(stderr, "Please fix conf_breed_pop_size, conf_mutate_pop_size and conf_elite_pop_size parameters\n");
+ exit(2);
+ }
+ }
+}
+
+void labeller_label(void)
+{
+ make_graph();
+ label_graph();
+ bfs_wrapper();
+ make_segments();
+
+ GARY_INIT(population1, conf_pop_size);
+ GARY_INIT(population2, conf_pop_size);
+ make_population();
+ rank_population();
+ qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
+
+ if (dbg_evolution >= VERBOSITY_GENERAL)
+ {
+ printf("Penalties after initialization\n");
+ dump_penalties(population1);
+ }
+
while (! shall_terminate())
{
iteration++;
if (dbg_evolution)
- printf("*** Iteration %d ***\n", iteration);
+ printf("\n*** Iteration %d ***\n", iteration);
+ breed();
mutate();
elite();
population1 = population2;
population2 = swp;
pop2_ind = 0;
-
- if (dbg_evolution)
- dump_penalties(population1);
+ clear_population(population2);
rank_population();
+
+ if (dbg_evolution >= VERBOSITY_GENERAL)
+ printf("Sorting population\n");
qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
- if (dbg_evolution)
+ if (dbg_evolution >= VERBOSITY_GENERAL)
+ {
+ printf("Penalties after sort\n");
dump_penalties(population1);
+ }
+
+ old_best = population1[0]->penalty;
}
+ if (dbg_overlaps >= VERBOSITY_GENERAL)
+ dump_bitmaps(population1[0]);
+
plan_individual(population1[0]);
labeller_cleanup();
void labeller_cleanup(void)
{
+ hash_cleanup();
+ GARY_FREE(requests_point);
+ GARY_FREE(requests_line);
+ GARY_FREE(requests_area);
}
void make_population(void)
init_individual(i2);
population2[i] = i2;
- if (dbg_init)
+ if (dbg_init >= VERBOSITY_INDIVIDUAL)
printf("Making individual %d\n", i);
struct individual *individual = ep_alloc(ep_individuals); init_individual(individual);
population1[i] = individual;
case TERM_COND_ITERATIONS:
return (iteration >= conf_iteration_limit);
default:
- // FIXME: Warn the user that no condition is set
+ fprintf(stderr, "Warning: No termination condition is set, terminating\n");
return 1;
}
}
void breed(void)
{
- int acc = 0;
int i=0;
- 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_pop_size)
+ while (i < 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);
+ int parent1 = randint(0, breed_rbest_size);
+ int parent2 = randint(0, breed_rbest_size);
+ if (dbg_breeding >= VERBOSITY_INDIVIDUAL)
+ printf("Will breed %d and %d\n", parent1, parent2);
+
breed_buffer = perform_crossover(population1[parent1], population1[parent2]);
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)
- {
- 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];
+ i += 2;
}
- // FIXME: Could there be one missing individual?
+ return;
}
struct individual **perform_crossover(struct individual *parent1, struct individual *parent2)
struct individual *child1 = ep_alloc(ep_individuals); init_individual(child1);
struct individual *child2 = ep_alloc(ep_individuals); init_individual(child2);
- printf("Performing crossover\n");
+ bool *processed;
+ GARY_INIT_ZERO(processed, GARY_SIZE(parent1->placements));
for (uns i=0; i<GARY_SIZE(parent1->placements); i++)
{
- printf("%dth placement out of %d\n", i, num_requests);
- if (! parent1->placements[i].processed)
+ if (! processed[parent1->placements[i].ind])
{
- struct placement **clos_symbols = get_closure(&(parent1->placements[i]), parent1, parent2);
- int x = randint(1, 2);
+ if (dbg_breeding >= VERBOSITY_PLACEMENT)
+ printf("Creating symbol closure for placement %u\n", i);
+
+ struct placement **clos_symbols = get_closure(&(parent1->placements[i]));
+ int x = randint(0, 2);
- if (x == 1)
+ if (x == 0)
{
- copy_symbols(clos_symbols, parent1, child1);
- copy_symbols(clos_symbols, parent2, child2);
+ if (dbg_breeding >= VERBOSITY_PLACEMENT)
+ printf("Copying parent->child 1->1 and 2->2\n");
+ copy_symbols(clos_symbols, parent1, child1, &processed);
+ copy_symbols(clos_symbols, parent2, child2, &processed);
}
else
{
- copy_symbols(clos_symbols, parent2, child1);
- copy_symbols(clos_symbols, parent1, child2);
+ if (dbg_breeding >= VERBOSITY_PLACEMENT)
+ printf("Copying parent->child 2->1 and 1->2\n");
+ copy_symbols(clos_symbols, parent2, child1, &processed);
+ copy_symbols(clos_symbols, parent1, child2, &processed);
}
- printf("Symbols copied; %lld\n", GARY_SIZE(clos_symbols));
+
GARY_FREE(clos_symbols);
}
+ }
- if (conf_mutate_children)
- {
- if (randint(1, 1000) < conf_mutate_children_prob * 1000) perform_mutation(child1);
- if (randint(1, 1000) < conf_mutate_children_prob * 1000) perform_mutation(child2);
- }
+ GARY_FREE(processed);
+
+ if (conf_mutate_children)
+ {
+ if (randint(1, 1000) < conf_mutate_children_prob * 1000) perform_mutation(child1);
+ if (randint(1, 1000) < conf_mutate_children_prob * 1000) perform_mutation(child2);
}
buffer[0] = child1;
{
for (int i=0; i < mutate_pop_size; i++)
{
- if (dbg_mutation)
- printf("%d\n", i);
- int ind = randint(1, mutate_rbest_size);
- if (dbg_mutation)
+ if (dbg_mutation >= VERBOSITY_INDIVIDUAL)
+ printf("Creating %d-th individual by mutation\n", i);
+ int ind = randint(0, mutate_rbest_size);
+ if (dbg_mutation >= VERBOSITY_INDIVIDUAL)
printf("Mutating %d-th individual of original population\n", ind);
+ population2[pop2_ind] = ep_alloc(ep_individuals);
copy_individual(population1[ind], population2[pop2_ind]);
- if (dbg_mutation)
+ if (dbg_mutation >= VERBOSITY_INDIVIDUAL)
printf("Individual %d in pop2 inited from individual %d in pop1\n", pop2_ind, ind);
perform_mutation(population2[pop2_ind]);
pop2_ind++;
if (x <= acc + conf_mutate_move_bound)
{
- if (dbg_mutation)
+ if (dbg_mutation >= VERBOSITY_PLACEMENT)
printf("Mutation: Moving symbol in placement %u\n", i);
move_symbol(&(individual->placements[i]));
continue;
}
}
}
+
+ hide_segment_labels(individual);
}
void elite(void)
{
for (int i=0; i<elite_pop_size; i++)
{
+ population2[pop2_ind] = ep_alloc(ep_individuals);
copy_individual(population1[i], population2[pop2_ind++]);
}
}
v1 = &(p1->request->variants[p1->variant_used]);
v2 = &(p2->request->variants[p2->variant_used]);
+ // FIXME: This doesn't fully respect offset which it probably should
int p1x = p1->x; int p1y = p1->y;
int p2x = p2->x; int p2y = p2->y;
struct map_part **parts = get_map_parts(p);
if (! parts)
{
- if (dbg_overlaps)
+ if (dbg_overlaps >= VERBOSITY_PLACEMENT)
printf("Placement of request %d seems not to be placed\n", p->request->ind);
return 0;
}
for (uns i=0; i<GARY_SIZE(parts); i++)
{
- struct map_placement *mp = parts[i]->placement->next;
+ struct map_placement *mp = parts[i]->placement->next_in_map;
while (mp)
{
if (! planned[mp->placement->request->ind])
*p = mp->placement;
planned[mp->placement->request->ind] = true;
}
- mp = mp->next;
+ mp = mp->next_in_map;
}
}
GARY_FREE(parts);
GARY_FREE(others);
+ if (dbg_overlaps >= VERBOSITY_PLACEMENT)
+ printf("Placement of request %d add %d to overlaps\n", p->request->ind, overlap);
+
return overlap;
}
return overlap;
}
+double get_distance(struct placement *p)
+{
+ if (p->variant_used < 0) return 0;
+ struct variant *v = &p->request->variants[p->variant_used];
+
+ double dx, dy, distance;
+ switch (p->request->type)
+ {
+ case REQUEST_POINT: ;
+ struct request_point *rp = (struct request_point *) p->request;
+ dx = rp->x + v->offset_x - p->x;
+ dy = rp->y + v->offset_y - p->y;
+ distance = sqrt(dx*dx + dy*dy);
+ if (dbg_rank >= VERBOSITY_PLACEMENT)
+ printf("Point placed at [%.2f; %.2f], expected at [%.2f; %.2f]\n", p->x, p->y, rp->x, rp->y);
+ break;
+ case REQUEST_AREA: ;
+ struct request_area *ra = (struct request_area *) p->request;
+ dx = ra->cx + v->offset_x - p->x;
+ dy = ra->cy + v->offset_y - p->y;
+ distance = sqrt(dx*dx + dy*dy);
+ if (dbg_rank >= VERBOSITY_PLACEMENT)
+ printf("Area placed at [%.2f; %.2f], expected at [%.2f; %.2f]\n", p->x, p->y, ra->cx, ra->cy);
+ break;
+ default:
+ return 0;
+ }
+
+ if (dbg_rank >= VERBOSITY_PLACEMENT)
+ printf("Placement %d has distance %.2f\n", p->ind, distance);
+ return distance;
+}
+
+double individual_distances(struct individual *individual)
+{
+ int distances = 0;
+
+ for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+ {
+ distances += get_distance(&individual->placements[i]);
+ }
+
+ return distances;
+}
+
int cmp_individual(const void *a, const void *b)
{
struct individual **ia = (struct individual **) a;
for (int i=0; i<conf_pop_size; i++)
{
- if (dbg_rank)
+ if (dbg_rank >= VERBOSITY_INDIVIDUAL)
printf("Individual %d\n", i);
population1[i]->penalty = 0;
penalty = individual_overlap(population1[i]);
- if (dbg_rank)
+ if (dbg_rank >= VERBOSITY_INDIVIDUAL)
printf("Increasing penalty by %d for overlap\n", penalty);
population1[i]->penalty += penalty;
+
+ penalty = individual_distances(population1[i]);
+ if (dbg_rank >= VERBOSITY_INDIVIDUAL)
+ printf("Increasing penalty by %d for distances\n", penalty);
+ population1[i]->penalty += penalty;
}
}
struct map_part **buffer;
GARY_INIT(buffer, 0);
- if (dbg_map_parts)
+ if (dbg_map_parts >= VERBOSITY_PLACEMENT)
printf("Looking for map parts containing placement of request %d, placed at [%.2f; %.2f]\n", p->request->ind, p->x, p->y);
struct variant v;
v = p->request->variants[p->variant_used];
break;
default:
+ if (dbg_map_parts >= VERBOSITY_ALL)
+ printf("Skipping unsupported request type (%d)\n", p->request->type);
return NULL;
}
+ if (dbg_map_parts >= VERBOSITY_PLACEMENT)
+ printf("Bitmap is %d x %d\n", v.width, v.height);
+
int x_min = max2(0, p->x) / conf_map_part_width;
- int x_max = min2(page_width_int, (p->x + v.width + conf_map_part_width - 1)) / conf_map_part_width;
+ // CHECK ME: Is rounding needed?
+ int x_max = min2(page_width_int, (p->x + v.width)) / conf_map_part_width;
int y_min = max2(0, p->y) / conf_map_part_height;
- int y_max = min2(page_height_int, (p->y + v.height + conf_map_part_height - 1)) / conf_map_part_height;
+ // CHECK ME: Is rounding needed?
+ int y_max = min2(page_height_int, (p->y + v.height)) / conf_map_part_height;
- if (dbg_map_parts)
+ if (dbg_map_parts >= VERBOSITY_PLACEMENT)
printf("Cells between [%d; %d] and [%d; %d] generated\n", x_min, y_min, x_max, y_max);
for (int y=y_min; y<=y_max; y++)
for (int x=x_min; x<=x_max; x++)
{
struct map_part **m = GARY_PUSH(buffer);
- if (dbg_map_parts)
+ if (dbg_map_parts >= VERBOSITY_ALL)
printf("Asking for %d of %u\n", y * num_map_parts_row + x, GARY_SIZE(p->individual->map));
*m = p->individual->map[y * num_map_parts_row + x];
}
+ if (dbg_map_parts >= VERBOSITY_PLACEMENT)
+ printf("Returning %u map parts potentially containing the symbol\n", GARY_SIZE(buffer));
+
return buffer;
}
-void update_map_parts(struct placement *p)
+void update_map_parts_delete(struct placement *p)
{
- struct placement_link *ml = p->map_links;
- while (ml)
+ struct map_placement *mp = p->map_links;
+ while (mp)
{
- struct map_placement *mp = ml->mp;
-
- mp->prev->next = mp->next;
- if (mp->next)
- mp->next->prev = mp->prev;
- free(mp);
+ mp->prev_in_map->next_in_map = mp->next_in_map;
+ if (mp->next_in_map)
+ mp->next_in_map->prev_in_map = mp->prev_in_map;
- struct placement_link *tmp = ml;
- ml = ml->next;
+ struct map_placement *tmp = mp;
+ mp = mp->next_in_placement;
free(tmp);
}
p->map_links = NULL;
+}
+void update_map_parts_create(struct placement *p)
+{
struct map_part **parts = get_map_parts(p);
if (parts == NULL) return;
{
struct map_placement *mp = malloc(sizeof(struct map_placement));
mp->placement = p;
+ mp->part = parts[i];
- mp->next = parts[i]->placement->next;
- mp->prev = parts[i]->placement;
- parts[i]->placement->next = mp;
- if (mp->next) mp->next->prev = mp;
+ mp->next_in_map = parts[i]->placement->next_in_map;
+ mp->prev_in_map = parts[i]->placement;
+ parts[i]->placement->next_in_map = mp;
+ if (mp->next_in_map) mp->next_in_map->prev_in_map = mp;
- struct placement_link *ml = malloc(sizeof(struct placement_link));
- ml->mp = mp;
- ml->next = p->map_links;
- p->map_links = ml;
+ mp->next_in_placement = p->map_links;
+ mp->prev_in_placement = NULL;
+ p->map_links = mp;
}
GARY_FREE(parts);
}
+void update_map_parts(struct placement *p)
+{
+ update_map_parts_delete(p);
+ update_map_parts_create(p);
+}
+
void gen_coords(struct placement *p)
{
switch(p->request->type)
printf("Not yet implemented\n");
break;
default:
- if (dbg_movement)
+ if (dbg_movement >= VERBOSITY_ALL)
printf("Testing request type\n");
ASSERT(p->request->type != REQUEST_INVALID);
}
double gen_movement(void)
{
- double m = (random() % 1000000) / 10000;
+ double m = (random() % 100000) / 10000;
m = pow(m, 1.0/3) * flip(1, -1);
- if (dbg_movement)
+ if (dbg_movement >= VERBOSITY_ALL)
printf("Movement %.2f\n", m);
return m;
}
p->x = p->x + gen_movement();
p->y = p->y + gen_movement();
- if (dbg_movement)
+ if (dbg_movement >= VERBOSITY_PLACEMENT)
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)
-{
- struct map_part **buffer;
- GARY_INIT(buffer, 0);
- int x_min = symbol->x / conf_part_size;
- int x_max = (symbol->x /*+ symbol->bitmap->width*/ + conf_part_size - 1) / conf_part_size;
- int y_min = symbol->y / conf_part_size;
- int y_max = (symbol->y /*+ symbol->bitmap->height*/ + conf_part_size - 1) / conf_part_size;
-
- for (int x=x_min; x < x_max; x++)
- for (int y=y_min; y < y_max; y++)
- {
- struct map_part *m = GARY_PUSH(buffer);
- *m = individual->map[x][y];
- }
-
- return buffer;
-}
-
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));
- return (r * (max - min));
}
-struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2 UNUSED)
+struct placement **get_closure(struct placement *placement)
{
- printf("Getting closure\n");
struct placement **closure;
GARY_INIT(closure, 0);
- bool *chosen = malloc(GARY_SIZE(parent1->placements) * sizeof(bool));
+ bool *chosen = malloc(GARY_SIZE(placement->individual->placements) * sizeof(bool));
+ for (uns i=0; i<GARY_SIZE(placement->individual->placements); i++) { chosen[i] = 0; }
chosen[placement->request->ind] = 1;
struct placement **p = GARY_PUSH(closure); *p = placement;
uns first = 0;
while (first < GARY_SIZE(closure))
{
- printf("Iterating, first is %d\n", first);
+ if (dbg_breeding >= VERBOSITY_ALL)
+ printf("Iterating, first is %d of current %u\n", first, GARY_SIZE(closure));
struct placement **overlapping = get_overlapping(placement);
- filter(overlapping, chosen);
+ if (! overlapping) { first++; continue; }
+
+ struct placement **filtered = filter(overlapping, &chosen);
+ if (dbg_breeding >= VERBOSITY_ALL)
+ printf("There are %u new overlapping symbols\n", GARY_SIZE(filtered));
+ GARY_FREE(overlapping);
+ overlapping = filtered;
for (uns j=0; j<GARY_SIZE(overlapping); j++)
{
- p = GARY_PUSH(closure); *p = overlapping[j];
- chosen[overlapping[j]->request->ind] = 1;
+ if (! chosen[overlapping[j]->request->ind])
+ {
+ if (overlaps(*p, overlapping[j]))
+ {
+ p = GARY_PUSH(closure); *p = overlapping[j];
+ if (dbg_breeding >= VERBOSITY_ALL)
+ printf("Adding placement of request %d (in fact at [%.2f; %.2f] of size %d x %d)\n", overlapping[j]->request->ind, overlapping[j]->x, overlapping[j]->y, overlapping[j]->request->variants[overlapping[j]->variant_used].width, overlapping[j]->request->variants[overlapping[j]->variant_used].height);
+ chosen[overlapping[j]->request->ind] = 1;
+ }
+ }
}
GARY_FREE(overlapping);
first++;
}
+ free(chosen);
+
return closure;
}
-void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child)
+void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child, bool **processed_ptr)
{
- //printf("%d\n", child->penalty);
- //printf("Closure size: %lld\n", GARY_SIZE(closure));
+ bool *processed = *processed_ptr;
+ if (dbg_breeding >= VERBOSITY_ALL)
+ printf("Will copy %u symbols\n", GARY_SIZE(closure));
+
for (uns i=0; i<GARY_SIZE(closure); i++)
{
- int ind = closure[i]->request->ind;
+ processed[closure[i]->ind] = 1;
+ int ind = closure[i]->ind;
child->placements[ind] = parent->placements[ind];
+ child->placements[ind].individual = child;
child->placements[ind].processed = 0;
+ child->placements[ind].map_links = NULL;
+ update_map_parts(&child->placements[ind]);
}
}
void init_placement(struct placement *p, struct individual *individual, struct request *r)
{
- // FIXME
p->ind = num_placements++;
p->request = r;
p->processed = 0;
break;
default:
ASSERT(p->request->type != REQUEST_INVALID);
- printf("Valid request: %d\n", p->request->type);
}
gen_coords(p);
- if (dbg_init)
+ if (dbg_init >= VERBOSITY_PLACEMENT)
printf("Inited placement to [%.2f; %.2f]\n", p->x, p->y);
}
-void init_individual(struct individual *i)
+void reset_individual_map(struct individual *i)
{
-//printf("Initing individual\n");
- GARY_INIT(i->placements, num_requests);
- GARY_INIT(i->map, 0);
for (uns j=0; j<num_map_parts; j++)
{
- struct map_part *part = GARY_PUSH(i->map);
- GARY_INIT(part->placement, 0);
- struct map_placement *mp = GARY_PUSH(part->placement);
+ struct map_placement *mp = i->map[j]->placement;
+ while (mp)
+ {
+ struct map_placement *tmp = mp;
+ mp = mp->next_in_map;
+ free(tmp);
+ }
+
+ free(i->map[j]);
+ struct map_part *part = malloc(sizeof(struct map_part));
+ part->ind = j;
+
+ mp = malloc(sizeof(struct map_placement));
+ part->placement = mp;
mp->placement = &dummy_placement;
- mp->next = mp->prev = NULL;
+ mp->next_in_map = mp->prev_in_map = NULL;
+ mp->next_in_placement = mp->prev_in_placement = NULL;
+ i->map[j] = part;
+ }
+}
+
+void update_individual(struct individual *individual)
+{
+ for (uns i=0; i<GARY_SIZE(individual->placements); i++)
+ {
+ update_map_parts_delete(&individual->placements[i]);
+ }
+}
+
+void clear_individual(struct individual *individual)
+{
+ for (uns j=0; j<num_map_parts; j++)
+ {
+ struct map_placement *mp = individual->map[j]->placement;
+ while (mp)
+ {
+ struct map_placement *tmp = mp;
+ mp = mp->next_in_map;
+ free(tmp);
+ }
+
+ free(individual->map[j]);
}
- i->penalty = 0; // FIXME
- if (dbg_init)
- printf("Individual inited, has %u map parts\n", GARY_SIZE(i->map));
+ GARY_FREE(individual->map);
+ GARY_FREE(individual->placements);
+ ep_free(ep_individuals, individual);
}
-struct placement **get_overlapping(struct placement *p UNUSED)
+void clear_population(struct individual **pop)
+{
+ for (uns i=0; i<GARY_SIZE(pop); i++)
+ {
+ clear_individual(pop[i]);
+ }
+}
+
+struct placement **get_overlapping(struct placement *p)
{
struct placement **buffer;
GARY_INIT(buffer, 0);
+
+ struct map_part **parts = get_map_parts(p);
+ if (! parts) return NULL;
+
+ for (uns i=0; i<GARY_SIZE(parts); i++)
+ {
+ struct map_placement *mp = parts[i]->placement->next_in_map;
+ while (mp)
+ {
+ if (p->variant_used >= 0)
+ {
+ struct placement **p = GARY_PUSH(buffer);
+ *p = mp->placement;
+ }
+ mp = mp->next_in_map;
+ }
+ }
+ GARY_FREE(parts);
+
+ if (dbg_map_parts >= VERBOSITY_PLACEMENT)
+ printf("Returning %u potentially overlapping placements\n", GARY_SIZE(buffer));
+
return buffer;
}
-void filter(struct placement **list UNUSED, bool *pred UNUSED)
+struct placement **filter(struct placement **list, bool **pred_ptr)
{
- // FIXME
+ bool *pred = *pred_ptr; // As GARY can't be passed directly
+ struct placement **filtered;
+ GARY_INIT(filtered, 0);
+
+ for (uns i=0; i<GARY_SIZE(list); i++)
+ {
+ if (pred[list[i]->request->ind])
+ continue;
+
+ struct placement **p = GARY_PUSH(filtered);
+ *p = list[i];
+ }
+
+ return filtered;
}
int flip(int a, int b)
return ((double) rand() / (double) RAND_MAX);
}
-void cleanup(void)
+void init_individual(struct individual *individual)
{
- hash_cleanup();
- GARY_FREE(requests_point);
- GARY_FREE(requests_line);
- GARY_FREE(requests_area);
+ GARY_INIT(individual->placements, num_requests);
+ GARY_INIT(individual->map, 0);
+ for (uns j=0; j<num_map_parts; j++)
+ {
+ GARY_PUSH(individual->map);
+ struct map_part *part = malloc(sizeof(struct map_part));
+ struct map_placement *mp = malloc(sizeof(struct map_placement));
+ part->placement = mp;
+ part->ind = j;
+ mp->placement = &dummy_placement;
+ mp->next_in_map = mp->prev_in_map = NULL;
+ mp->next_in_placement = mp->prev_in_placement = NULL;
+ individual->map[j] = part;
+ }
+ individual->penalty = 0;
}
void copy_individual(struct individual *src, struct individual *dest)
{
+ init_individual(dest);
dest->penalty = src->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];
dest->placements[i].map_links = NULL;
- }
- for (uns j=0; j<num_map_parts; j++)
- {
- struct map_part *part = GARY_PUSH(dest->map);
- GARY_INIT(part->placement, 0);
- struct map_placement *mp = GARY_PUSH(part->placement);
- mp->placement = &dummy_placement;
- mp->next = mp->prev = NULL;
+ dest->placements[i].individual = dest;
+
+ update_map_parts_create(&dest->placements[i]);
}
}