From e488aed919c541b40dc8a10de305980e964a4889 Mon Sep 17 00:00:00 2001 From: Karryanna Date: Wed, 13 May 2015 19:04:48 +0200 Subject: [PATCH] Labelling: Let's evolve! --- labeller.c | 104 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 20 deletions(-) diff --git a/labeller.c b/labeller.c index f0ddeff..3c5e4fa 100644 --- a/labeller.c +++ b/labeller.c @@ -51,6 +51,8 @@ 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 page_width_int; int page_height_int; @@ -73,16 +75,20 @@ int conf_breed_pop_size_perc = 20; int conf_breed_perc = 50; // Percentage of new pop created by breeding bool conf_mutate_children = 1; -int conf_mutate_children_prob = 0.3; +double conf_mutate_children_prob = 0.3; -int conf_mutate_rbest_perc = 60; -int conf_mutate_pop_size_perc = 20; +double conf_mutate_rbest = 1; +double conf_mutate_pop_size = 0.9; -int conf_mutate_move_bound = 0.2; -int conf_mutate_regen_bound = 0.1; -int conf_mutate_chvar_bound = 0.1; +double conf_mutate_move_bound = 1.0; +double conf_mutate_regen_bound = 0.0; +double conf_mutate_chvar_bound = 0.0; -int conf_elite_perc = 5; +int mutate_pop_size; +int mutate_rbest_size; + +double conf_elite_pop_size = 0.1; +int elite_pop_size; double conf_max_section_length = 100; double conf_max_section_overlay = 10; @@ -144,6 +150,7 @@ void dump_longlines(void); void dump_linelabel_requests(void); void dump_individual(struct individual *individual); void print_label(struct symbol *sym); +void dump_penalties(void); double gen_movement(void); double gen_movement_uniform(void); @@ -1033,7 +1040,14 @@ if (dbg_plan) ASSERT(s->type != SYMBOLIZER_INVALID); } } +} +void dump_penalties(void) +{ + for (int i=0; ipenalty); + } } void labeller_label(void) @@ -1048,20 +1062,53 @@ printf("Having %u point requests, %u line requests and %u area requests\n", GARY 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) + dump_penalties(); printf("Dealing with %d requests\n", num_requests); -/* + mutate_pop_size = conf_mutate_pop_size * conf_pop_size; + mutate_rbest_size = conf_mutate_rbest * conf_pop_size; + if (dbg_evolution) + { + printf("Mutation parameters:\n"); + printf(" %d individuals are created\n", mutate_pop_size); + printf(" %d best individuals in old population are considered\n", mutate_rbest_size); + } + + elite_pop_size = conf_elite_pop_size * conf_pop_size; + if (dbg_evolution) + { + printf("Elitism parameters:\n"); + printf(" %d best individuals are copied\n", elite_pop_size); + } + while (! shall_terminate()) { iteration++; + if (dbg_evolution) + printf("*** Iteration %d ***\n", iteration); + + mutate(); + elite(); struct individual **swp = population1; population1 = population2; population2 = swp; pop2_ind = 0; + + if (dbg_evolution) + dump_penalties(); + + rank_population(); + qsort(population1, conf_pop_size, sizeof(struct individual *), cmp_individual); + + if (dbg_evolution) + dump_penalties(); } -*/ plan_individual(population1[0]); @@ -1216,12 +1263,16 @@ struct individual **perform_crossover(struct individual *parent1, struct individ void mutate(void) { - int i = 0; - int conf_mutate_pop_size = conf_mutate_pop_size_perc * conf_pop_size; - while (i < conf_mutate_rbest_perc * conf_pop_size) + for (int i=0; i < mutate_pop_size; i++) { - int ind = randint(1, conf_mutate_pop_size); - copy_individual(population2[pop2_ind], population1[ind]); + if (dbg_mutation) + printf("%d\n", i); + int ind = randint(1, mutate_rbest_size); + if (dbg_mutation) + printf("Mutating %d-th individual of original population\n", ind); + copy_individual(population1[ind], population2[pop2_ind]); + if (dbg_mutation) + printf("Individual %d in pop2 inited from individual %d in pop1\n", pop2_ind, ind); perform_mutation(population2[pop2_ind]); pop2_ind++; } @@ -1231,11 +1282,13 @@ void perform_mutation(struct individual *individual) { for (uns i=0; iplacements); i++) { - int x = randint(1, 1000); - int acc = 0; + double x = randdouble(); + double acc = 0; if (x <= acc + conf_mutate_move_bound) { + if (dbg_mutation) + printf("Mutation: Moving symbol in placement %u\n", i); move_symbol(&(individual->placements[i])); continue; } @@ -1250,9 +1303,20 @@ void perform_mutation(struct individual *individual) if (x <= acc + conf_mutate_chvar_bound) { - if (0) // if num_variants > 1 + struct placement *p = &(individual->placements[i]); + switch (p->request->type) { - // FIXME: assign new variant + case REQUEST_POINT: + case REQUEST_SEGMENT: + case REQUEST_AREA: + // Does nothing when there are 0 variants... does it mind? + p->variant_used = randint(0, GARY_SIZE(p->request->variants) - 1); + break; + case REQUEST_SECTION: + p->variant_used = randint(0, GARY_SIZE(((struct request_section *) p->request)->segments)-1); + break; + default: + ; } } } @@ -1260,9 +1324,9 @@ void perform_mutation(struct individual *individual) void elite(void) { - for (int i=0; i