/**
- * collectd - src/sn-evolution.c
- * Copyright (C) 2008,2009 Florian octo Forster
+ * libsortnetwork - src/sn-evolution.c
+ * Copyright (C) 2008-2010 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <ff at octo.it>
**/
#ifndef _ISOC99_SOURCE
# define _ISOC99_SOURCE
#endif
#ifndef _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE 200112L
+# define _POSIX_C_SOURCE 200809L
+#endif
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 700
#endif
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
+#include <strings.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "sn_network.h"
#include "sn_random.h"
-/* Yes, this is ugly, but the GNU libc doesn't export it with the above flags.
- * */
-char *strdup (const char *s);
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
static uint64_t iteration_counter = 0;
static int inputs_num = 16;
static int max_population_size = 128;
static population_t *population;
+static enum
+{
+ MERGER_ODDEVEN,
+ MERGER_BITONIC,
+ MERGER_RANDOM
+} selected_merger = MERGER_ODDEVEN;
+
static int evolution_threads_num = 4;
static int do_loop = 0;
-static void sigint_handler (int signal)
+static void sigint_handler (int signal __attribute__((unused)))
{
do_loop++;
} /* void sigint_handler */
" -p <num> Size of the population (default: 128)\n"
" -P <peer> Send individuals to <peer> (may be repeated)\n"
" -t <num> Number of threads (default: 4)\n"
+ " -m <merger> Specify the merging network to use.\n"
+ " Available: \"oddeven\", \"bitonic\", \"random\"\n"
"\n",
name);
exit (1);
{
int option;
- while ((option = getopt (argc, argv, "i:o:p:P:s:t:h")) != -1)
+ while ((option = getopt (argc, argv, "i:o:p:P:s:t:m:h")) != -1)
{
switch (option)
{
break;
}
+ case 'm':
+ {
+ if (strcasecmp ("oddeven", optarg) == 0)
+ selected_merger = MERGER_ODDEVEN;
+ else if (strcasecmp ("bitonic", optarg) == 0)
+ selected_merger = MERGER_BITONIC;
+ else if (strcasecmp ("random", optarg) == 0)
+ selected_merger = MERGER_RANDOM;
+ else
+ fprintf (stderr, "Not a valid merging strategy: \"%s\"\n", optarg);
+ break;
+ }
+
case 'h':
default:
exit_usage (argv[0]);
return (rate);
} /* int rate_network */
+#if 0
static int mutate_network (sn_network_t *n)
{
sn_network_t *n_copy;
return (0);
} /* int mutate_network */
+#endif
static int create_offspring (void)
{
assert (p1 != NULL);
/* combine the two parents */
- n = sn_network_combine (p0, p1, inputs_num_is_power_of_two);
+ if ((selected_merger == MERGER_ODDEVEN)
+ || ((selected_merger == MERGER_RANDOM)
+ && (sn_bounded_random (0, 1) == 0)))
+ n = sn_network_combine_odd_even_merge (p0, p1);
+ else
+ n = sn_network_combine_bitonic_merge (p0, p1);
sn_network_destroy (p0);
sn_network_destroy (p1);
assert (SN_NETWORK_INPUT_NUM (n) == inputs_num);
+#if 0
if ((SN_NETWORK_INPUT_NUM (n) <= 16) && (sn_bounded_random (0, 100) <= 1))
mutate_network (n);
+#endif
population_insert (population, n);
return (0);
} /* int create_offspring */
-static void *evolution_thread (void *arg)
+static void *evolution_thread (void *arg __attribute__((unused)))
{
while (do_loop == 0)
{