From: Karryanna <karry@karryanna.cz>
Date: Wed, 13 May 2015 09:46:09 +0000 (+0200)
Subject: Labelling: Basic ranking
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=19d8760311b1e306939469380cfbb291103554f7;p=leo.git

Labelling: Basic ranking
---

diff --git a/labeller.c b/labeller.c
index 3ccb6a1..b7b8ee4 100644
--- a/labeller.c
+++ b/labeller.c
@@ -50,6 +50,7 @@ int dbg_map_parts = 0;
 int dbg_movement = 0;
 int dbg_init = 0;
 int dbg_overlaps = 0;
+int dbg_rank = 0;
 
 int page_width_int;
 int page_height_int;
@@ -1349,7 +1350,19 @@ int individual_overlap(struct individual *individual)
 
 void rank_population(void)
 {
-  // FIXME
+  int penalty;
+
+  for (int i=0; i<conf_pop_size; i++)
+  {
+    if (dbg_rank)
+      printf("Individual %d\n", i);
+    population1[i]->penalty = 0;
+
+    penalty = individual_overlap(population1[i]);
+    if (dbg_rank)
+      printf("Increasing penalty by %d for overlap\n", penalty);
+    population1[i]->penalty += penalty;
+  }
 }
 
 struct map_part **get_map_parts(struct placement *p)