int dbg_rank = 0;
int dbg_evolution = 0;
int dbg_mutation = 0;
+int dbg_breeding = 0;
int page_width_int;
int page_height_int;
int conf_part_size = 50;
int move_min = 0;
-int move_max = 1;
+int move_max = 5;
int num_requests = 0;
+int num_placements = 0;
int conf_map_part_width = 5;
int conf_map_part_height = 5;
void dump_linelabel_requests(void);
void dump_individual(struct individual *individual);
void print_label(struct symbol *sym);
-void dump_penalties(void);
+void dump_penalties(struct individual **population);
double gen_movement(void);
double gen_movement_uniform(void);
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);
+struct placement **get_closure(struct placement *placement);
+void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child, bool **processed_ptr);
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);
+struct placement **filter(struct placement **list, bool **pred_ptr);
int flip(int a, int b);
double randdouble(void);
void make_bitmap(struct variant *v, struct symbol *sym)
{
+ v->offset_x = v->offset_y = 0;
+
switch (sym->type)
{
case SYMBOLIZER_POINT:
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;
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)
rs->x2 = e->n2->o->x;
rs->y2 = e->n2->o->y;
- // FIXME: Set text rotation
- rs->angle = atan2(rs->x2 - rs->x1, rs->y2 - rs->y1);
+ rs->slope = (rs->y2 - rs->y1) / (rs->x2 - rs->x1);
rs->zindex = e->zindex;
cur_length += e->length;
}
}
-void dump_penalties(void)
+void dump_penalties(struct individual **population)
{
for (int i=0; i<conf_pop_size; i++)
{
- printf("Individual %d has penalty %d\n", i, population1[i]->penalty);
+ printf("Individual %d has penalty %d\n", i, population[i]->penalty);
}
}
qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
if (dbg_evolution)
- dump_penalties();
+ dump_penalties(population1);
- 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)
+ {
+ 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)
printf("*** Iteration %d ***\n", iteration);
+ breed();
mutate();
elite();
pop2_ind = 0;
if (dbg_evolution)
- dump_penalties();
+ dump_penalties(population1);
rank_population();
qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual);
if (dbg_evolution)
- dump_penalties();
+ dump_penalties(population1);
}
plan_individual(population1[0]);
{
for (int i=0; i<conf_pop_size; i++)
{
+ num_placements = 0; // FIXME: This IS a terrible HACK
struct individual *i2 = ep_alloc(ep_individuals);
init_individual(i2);
population2[i] = i2;
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-1);
+ int parent2 = randint(0, breed_rbest_size-1);
+ if (dbg_breeding)
+ 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);
+ if (dbg_breeding)
+ printf("Creating symbol closure for placement %u\n", i);
+
+ struct placement **clos_symbols = get_closure(&(parent1->placements[i]));
int x = randint(1, 2);
if (x == 1)
{
- copy_symbols(clos_symbols, parent1, child1);
- copy_symbols(clos_symbols, parent2, child2);
+ if (dbg_breeding)
+ 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)
+ 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;
}
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)
printf("Cells between [%d; %d] and [%d; %d] generated\n", x_min, y_min, x_max, y_max);
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)
printf("Movement %.2f\n", m);
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)
+ 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)
+ 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)
+ 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++;
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)
+ 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].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;
p->x = p->y = 0; // To prevent valgrind from complaining
printf("Individual inited, has %u map parts\n", GARY_SIZE(i->map));
}
-struct placement **get_overlapping(struct placement *p UNUSED)
+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;
+ while (mp)
+ {
+ if (p->variant_used >= 0)
+ {
+ struct placement **p = GARY_PUSH(buffer);
+ *p = mp->placement;
+ }
+ mp = mp->next;
+ }
+ }
+ GARY_FREE(parts);
+
+ if (dbg_map_parts)
+ 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)
projects / leo.git / blobdiff