X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn-evolution.c;h=ffe5c34e591a9cbfd6f60bc402f3367a4afc8ac6;hb=f408d1dd2f79bc8c7e765af56c8b023e95e21046;hp=b6c37b473ca5345c4dd7ba806688783b0add0702;hpb=9cbc448819152a9adde2b42439426ee874a30fc3;p=sort-networks.git

diff --git a/src/sn-evolution.c b/src/sn-evolution.c
index b6c37b4..ffe5c34 100644
--- a/src/sn-evolution.c
+++ b/src/sn-evolution.c
@@ -19,8 +19,12 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#define _ISOC99_SOURCE
-#define _POSIX_C_SOURCE 200112L
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -125,109 +129,43 @@ int read_options (int argc, char **argv)
   return (0);
 } /* int read_options */
 
-#if 0
-static int rate_network (const sn_network_t *n)
+static int mutate_network (sn_network_t *n)
 {
-  int rate;
-  int i;
-
-  rate = SN_NETWORK_STAGE_NUM (n) * SN_NETWORK_INPUT_NUM (n);
-  for (i = 0; i < SN_NETWORK_STAGE_NUM (n); i++)
-  {
-    sn_stage_t *s = SN_NETWORK_STAGE_GET (n, i);
-    rate += SN_STAGE_COMP_NUM (s);
-  }
-
-  return (rate);
-} /* int rate_network */
-#endif
-
-#if 0
-static int population_print_stats (int iterations)
-{
-  int best = -1;
-  int total = 0;
-  int i;
-
-  for (i = 0; i < population_size; i++)
+  sn_network_t *n_copy;
+  int stage_index;
+  sn_stage_t *s;
+  int comparator_index;
+  int status;
+
+  n_copy = sn_network_clone (n);
+  if (n_copy == NULL)
   {
-    if ((best == -1) || (best > population[i].rating))
-      best = population[i].rating;
-    total += population[i].rating;
+    fprintf (stderr, "mutate_network: sn_network_clone failed.\n");
+    return (-1);
   }
 
-  printf ("Iterations: %6i; Best: %i; Average: %.2f;\n",
-      iterations, best, ((double) total) / ((double) population_size));
-
-  return (0);
-} /* int population_print_stats */
-#endif
+  stage_index = sn_bounded_random (0, SN_NETWORK_STAGE_NUM (n_copy) - 1);
+  s = SN_NETWORK_STAGE_GET (n_copy, stage_index);
 
-#if 0
-static int insert_into_population (sn_network_t *n)
-{
-  int rating;
-  int worst_rating;
-  int worst_index;
-  int best_rating;
-  int nmemb;
-  int i;
+  comparator_index = sn_bounded_random (0, SN_STAGE_COMP_NUM (s) - 1);
+  sn_stage_comparator_remove (s, comparator_index);
 
-  rating = rate_network (n);
+  status = sn_network_brute_force_check (n_copy);
+  
+  sn_network_destroy (n_copy);
 
-  if (population_size < max_population_size)
-  {
-    population[population_size].network = n;
-    population[population_size].rating  = rating;
-    population_size++;
-    return (0);
-  }
-
-  worst_rating = -1;
-  worst_index  = -1;
-  best_rating  = -1;
-  for (i = 0; i < olymp_size; i++)
-  {
-    if (population[i].rating > worst_rating)
-    {
-      worst_rating = population[i].rating;
-      worst_index  = i;
-    }
-    if ((population[i].rating < best_rating)
-	|| (best_rating == -1))
-      best_rating = population[i].rating;
-  }
-
-  if (rating < best_rating)
-  {
-    if (best_output_file != NULL)
-    {
-      printf ("Writing network with rating %i to %s\n",
-	  rating, best_output_file);
-      sn_network_write_file (n, best_output_file);
-    }
-    else
-    {
-      printf ("New best solution has rating %i\n",
-	  rating);
-    }
-  }
-
-  nmemb = max_population_size - (worst_index + 1);
-
-  sn_network_destroy (population[worst_index].network);
-  population[worst_index].network = NULL;
-
-  memmove (population + worst_index,
-      population + (worst_index + 1),
-      nmemb * sizeof (population_entry_t));
+  if (status < 0)
+    return (-1);
+  else if (status > 0) /* Mutated network does not sort anymore. */
+    return (1);
 
-  population[max_population_size - 1].network = n;
-  population[max_population_size - 1].rating  = rating;
+  /* We saved one comparator \o/ Let's do the same change on the original
+   * network. */
+  s = SN_NETWORK_STAGE_GET (n, stage_index);
+  sn_stage_comparator_remove (s, comparator_index);
 
   return (0);
-} /* int insert_into_population */
-#endif
+} /* int mutate_network */
 
 static int create_offspring (void)
 {
@@ -266,6 +204,15 @@ static int create_offspring (void)
 
   assert (SN_NETWORK_INPUT_NUM (n) == inputs_num);
 
+  if (sn_bounded_random (0, 100) <= 1)
+  {
+    int status;
+
+    status = mutate_network (n);
+    if (status == 0)
+      printf ("Debug: Mutation successfull.\n");
+  }
+
   sn_population_push (population, n);
 
   sn_network_destroy (n);
@@ -333,6 +280,7 @@ static int evolution_start (int threads_num)
 int main (int argc, char **argv)
 {
   struct sigaction sigint_action;
+  struct sigaction sigterm_action;
 
   read_options (argc, argv);
   if (initial_input_file == NULL)
@@ -342,6 +290,10 @@ int main (int argc, char **argv)
   sigint_action.sa_handler = sigint_handler;
   sigaction (SIGINT, &sigint_action, NULL);
 
+  memset (&sigterm_action, '\0', sizeof (sigterm_action));
+  sigterm_action.sa_handler = sigint_handler;
+  sigaction (SIGTERM, &sigterm_action, NULL);
+
   population = sn_population_create (max_population_size);
   if (population == NULL)
   {