X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn_network.c;h=c421995e21f351bcaef8e3ad917e5eba772c7766;hb=81effefb7705a491ca062e54f31aa03093c28dbc;hp=5576b864c7f5b7f8e165c30cffef2b44944e80e5;hpb=1de228eb46552e2cc4555ac5a0c4adf75a8fc5db;p=sort-networks.git diff --git a/src/sn_network.c b/src/sn_network.c index 5576b86..c421995 100644 --- a/src/sn_network.c +++ b/src/sn_network.c @@ -1,22 +1,23 @@ /** - * collectd - src/sn_network.c - * Copyright (C) 2008 Florian octo Forster + * libsortnetwork - src/sn_network.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 - * Free Software Foundation; only version 2 of the License is applicable. + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at + * your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #ifndef _ISOC99_SOURCE @@ -38,6 +39,7 @@ #include #include #include +#include #include "sn_network.h" #include "sn_random.h" @@ -76,10 +78,228 @@ void sn_network_destroy (sn_network_t *n) /* {{{ */ free (n); } /* }}} void sn_network_destroy */ +sn_network_t *sn_network_create_odd_even_mergesort (int inputs_num) /* {{{ */ +{ + sn_network_t *n; + + assert (inputs_num > 0); + if (inputs_num == 1) + { + return (sn_network_create (inputs_num)); + } + if (inputs_num == 2) + { + sn_comparator_t c; + + n = sn_network_create (inputs_num); + + memset (&c, 0, sizeof (c)); + c.min = 0; + c.max = 1; + + sn_network_comparator_add (n, &c); + + return (n); + } + else + { + sn_network_t *n_left; + sn_network_t *n_right; + int inputs_left; + int inputs_right; + + inputs_left = inputs_num / 2; + inputs_right = inputs_num - inputs_left; + + n_left = sn_network_create_odd_even_mergesort (inputs_left); + if (n_left == NULL) + return (NULL); + + n_right = sn_network_create_odd_even_mergesort (inputs_right); + if (n_right == NULL) + { + sn_network_destroy (n_left); + return (NULL); + } + + n = sn_network_combine_odd_even_merge (n_left, n_right); + + sn_network_destroy (n_left); + sn_network_destroy (n_right); + + if (n != NULL) + sn_network_compress (n); + + return (n); + } +} /* }}} sn_network_t *sn_network_create_odd_even_mergesort */ + +sn_network_t *sn_network_create_bitonic_mergesort (int inputs_num) /* {{{ */ +{ + sn_network_t *n; + + assert (inputs_num > 0); + if (inputs_num == 1) + { + return (sn_network_create (inputs_num)); + } + if (inputs_num == 2) + { + sn_comparator_t c; + + n = sn_network_create (inputs_num); + + memset (&c, 0, sizeof (c)); + c.min = 0; + c.max = 1; + + sn_network_comparator_add (n, &c); + + return (n); + } + else + { + sn_network_t *n_left; + sn_network_t *n_right; + int inputs_left; + int inputs_right; + + inputs_left = inputs_num / 2; + inputs_right = inputs_num - inputs_left; + + n_left = sn_network_create_bitonic_mergesort (inputs_left); + if (n_left == NULL) + return (NULL); + + if (inputs_left != inputs_right) + n_right = sn_network_create_bitonic_mergesort (inputs_right); + else + n_right = n_left; + if (n_right == NULL) + { + sn_network_destroy (n_left); + return (NULL); + } + + n = sn_network_combine_bitonic_merge (n_left, n_right); + + if (n_left != n_right) + sn_network_destroy (n_right); + sn_network_destroy (n_left); + + if (n != NULL) + sn_network_compress (n); + + return (n); + } +} /* }}} sn_network_t *sn_network_create_bitonic_mergesort */ + +static int sn_network_create_pairwise_internal (sn_network_t *n, /* {{{ */ + int *inputs, int inputs_num) +{ + int i; + int inputs_copy[inputs_num]; + int m; + + for (i = 1; i < inputs_num; i += 2) + { + sn_comparator_t *c = sn_comparator_create (inputs[i-1], inputs[i]); + sn_network_comparator_add (n, c); + sn_comparator_destroy (c); + } + + if (inputs_num <= 2) + return (0); + + /* Sort "pairs" recursively. Like with odd-even mergesort, odd and even lines + * are handled recursively and later reunited. */ + for (i = 0; i < inputs_num; i += 2) + inputs_copy[(int) (i / 2)] = inputs[i]; + /* Recursive call #1 with first set of lines */ + sn_network_create_pairwise_internal (n, inputs_copy, + (int) ((inputs_num + 1) / 2)); + + for (i = 1; i < inputs_num; i += 2) + inputs_copy[(int) (i / 2)] = inputs[i]; + /* Recursive call #2 with second set of lines */ + sn_network_create_pairwise_internal (n, inputs_copy, + (int) (inputs_num/ 2)); + + /* m is the "amplitude" of the sorted pairs. This is a bit tricky to read due + * to different indices being used in the paper, unfortunately. */ + m = inputs_num / 2; + while (m > 1) + { + for (i = 1; (i + (m - 1)) < inputs_num; i += 2) + { + int left = i; + int right = i + (m - 1); + sn_comparator_t *c; + + assert (left < right); + c = sn_comparator_create (inputs[left], inputs[right]); + sn_network_comparator_add (n, c); + sn_comparator_destroy (c); + } + + m = m / 2; + } /* while (m > 1) */ + + return (0); +} /* }}} int sn_network_create_pairwise_internal */ + +sn_network_t *sn_network_create_pairwise (int inputs_num) /* {{{ */ +{ + sn_network_t *n = sn_network_create (inputs_num); + int inputs[inputs_num]; + int i; + + if (n == NULL) + return (NULL); + + for (i = 0; i < inputs_num; i++) + inputs[i] = i; + + sn_network_create_pairwise_internal (n, inputs, inputs_num); + sn_network_compress (n); + + return (n); +} /* }}} sn_network_t *sn_network_create_pairwise */ + +int sn_network_network_add (sn_network_t *n, sn_network_t *other) /* {{{ */ +{ + int stages_num; + sn_stage_t **tmp; + + if ((n == NULL) || (other == NULL)) + return (EINVAL); + + stages_num = n->stages_num + other->stages_num; + if (stages_num <= n->stages_num) + return (EINVAL); + + tmp = realloc (n->stages, sizeof (*n->stages) * stages_num); + if (tmp == NULL) + return (ENOMEM); + n->stages = tmp; + + memcpy (n->stages + n->stages_num, other->stages, + sizeof (*other->stages) * other->stages_num); + n->stages_num = stages_num; + + free (other->stages); + free (other); + + return (0); +} /* }}} int sn_network_network_add */ + int sn_network_stage_add (sn_network_t *n, sn_stage_t *s) /* {{{ */ { sn_stage_t **temp; + if ((n == NULL) || (s == NULL)) + return (EINVAL); + temp = (sn_stage_t **) realloc (n->stages, (n->stages_num + 1) * sizeof (sn_stage_t *)); if (temp == NULL) @@ -98,7 +318,8 @@ int sn_network_stage_remove (sn_network_t *n, int s_num) /* {{{ */ int nmemb = n->stages_num - (s_num + 1); sn_stage_t **temp; - assert (s_num < n->stages_num); + if ((n == NULL) || (s_num >= n->stages_num)) + return (EINVAL); sn_stage_destroy (n->stages[s_num]); n->stages[s_num] = NULL; @@ -106,7 +327,7 @@ int sn_network_stage_remove (sn_network_t *n, int s_num) /* {{{ */ if (nmemb > 0) { memmove (n->stages + s_num, n->stages + (s_num + 1), - nmemb * sizeof (sn_stage_t *)); + nmemb * sizeof (sn_stage_t *)); n->stages[n->stages_num - 1] = NULL; } n->stages_num--; @@ -120,7 +341,7 @@ int sn_network_stage_remove (sn_network_t *n, int s_num) /* {{{ */ else { temp = (sn_stage_t **) realloc (n->stages, - n->stages_num * sizeof (sn_stage_t *)); + n->stages_num * sizeof (sn_stage_t *)); if (temp == NULL) return (-1); n->stages = temp; @@ -161,6 +382,47 @@ sn_network_t *sn_network_clone (const sn_network_t *n) /* {{{ */ return (n_copy); } /* }}} sn_network_t *sn_network_clone */ +int sn_network_comparator_add (sn_network_t *n, /* {{{ */ + const sn_comparator_t *c) +{ + sn_stage_t *s; + + if ((n == NULL) || (c == NULL)) + return (EINVAL); + + if (n->stages_num > 0) + { + s = n->stages[n->stages_num - 1]; + + if (sn_stage_comparator_check_conflict (s, c) == 0) + { + sn_stage_comparator_add (s, c); + return (0); + } + } + + s = sn_stage_create (n->stages_num); + sn_stage_comparator_add (s, c); + sn_network_stage_add (n, s); + + return (0); +} /* }}} int sn_network_comparator_add */ + +int sn_network_get_comparator_num (const sn_network_t *n) /* {{{ */ +{ + int num; + int i; + + if (n == NULL) + return (-1); + + num = 0; + for (i = 0; i < n->stages_num; i++) + num += n->stages[i]->comparators_num; + + return (num); +} /* }}} int sn_network_get_comparator_num */ + int sn_network_show (sn_network_t *n) /* {{{ */ { int i; @@ -175,6 +437,9 @@ int sn_network_invert (sn_network_t *n) /* {{{ */ { int i; + if (n == NULL) + return (EINVAL); + for (i = 0; i < n->stages_num; i++) sn_stage_invert (n->stages[i]); @@ -185,6 +450,12 @@ int sn_network_shift (sn_network_t *n, int sw) /* {{{ */ { int i; + if ((n == NULL) || (sw < 0)) + return (EINVAL); + + if (sw == 0) + return (0); + for (i = 0; i < n->stages_num; i++) sn_stage_shift (n->stages[i], sw, SN_NETWORK_INPUT_NUM (n)); @@ -200,9 +471,9 @@ int sn_network_compress (sn_network_t *n) /* {{{ */ for (i = 1; i < n->stages_num; i++) { sn_stage_t *s; - + s = n->stages[i]; - + for (j = 0; j < SN_STAGE_COMP_NUM (s); j++) { sn_comparator_t *c = SN_STAGE_COMP_GET (s, j); @@ -210,26 +481,26 @@ int sn_network_compress (sn_network_t *n) /* {{{ */ for (k = i - 1; k >= 0; k--) { - int conflict; - - conflict = sn_stage_comparator_check_conflict (n->stages[k], c); - if (conflict == 0) - { - move_to = k; - continue; - } - - if (conflict == 2) - move_to = -1; - break; + int conflict; + + conflict = sn_stage_comparator_check_conflict (n->stages[k], c); + if (conflict == 0) + { + move_to = k; + continue; + } + + if (conflict == 2) + move_to = -1; + break; } if (move_to < i) { - if (move_to >= 0) - sn_stage_comparator_add (n->stages[move_to], c); - sn_stage_comparator_remove (s, j); - j--; + if (move_to >= 0) + sn_stage_comparator_add (n->stages[move_to], c); + sn_stage_comparator_remove (s, j); + j--; } } } @@ -245,7 +516,7 @@ int sn_network_normalize (sn_network_t *n) /* {{{ */ { int i; - for (i = n->stages_num - 1; i >= 0; i--) + for (i = 0; i < n->stages_num; i++) { sn_stage_t *s; int j; @@ -265,10 +536,13 @@ int sn_network_normalize (sn_network_t *n) /* {{{ */ if (min > max) { - int k; + int k; - for (k = i; k >= 0; k--) - sn_stage_swap (n->stages[k], min, max); + for (k = i; k < n->stages_num; k++) + sn_stage_swap (n->stages[k], min, max); + + i = -1; + break; /* for (j) */ } } /* for (j = 0 .. #comparators) */ } /* for (i = n->stages_num - 1 .. 0) */ @@ -276,6 +550,37 @@ int sn_network_normalize (sn_network_t *n) /* {{{ */ return (0); } /* }}} int sn_network_normalize */ +int sn_network_unify (sn_network_t *n) /* {{{ */ +{ + int i; + + if (n == NULL) + return (EINVAL); + + sn_network_normalize (n); + sn_network_compress (n); + + for (i = 0; i < n->stages_num; i++) + sn_stage_unify (n->stages[i]); + + return (0); +} /* }}} int sn_network_unify */ + +int sn_network_remove_input (sn_network_t *n, int input) /* {{{ */ +{ + int i; + + if ((n == NULL) || (input < 0) || (input >= n->inputs_num)) + return (EINVAL); + + for (i = 0; i < n->stages_num; i++) + sn_stage_remove_input (n->stages[i], input); + + n->inputs_num--; + + return (0); +} /* }}} int sn_network_remove_input */ + int sn_network_cut_at (sn_network_t *n, int input, /* {{{ */ enum sn_network_cut_dir_e dir) { @@ -295,7 +600,7 @@ int sn_network_cut_at (sn_network_t *n, int input, /* {{{ */ int j; for (j = 0; j < i; j++) - sn_stage_swap (n->stages[j], position, new_position); + sn_stage_swap (n->stages[j], position, new_position); } position = new_position; @@ -304,13 +609,36 @@ int sn_network_cut_at (sn_network_t *n, int input, /* {{{ */ assert (((dir == DIR_MIN) && (position == 0)) || ((dir == DIR_MAX) && (position == (n->inputs_num - 1)))); + sn_network_remove_input (n, position); + + return (0); +} /* }}} int sn_network_cut_at */ + +int sn_network_cut (sn_network_t *n, int *mask) /* {{{ */ +{ + int inputs_num; + int i; + for (i = 0; i < n->stages_num; i++) - sn_stage_remove_input (n->stages[i], position); + { + sn_stage_t *s = n->stages[i]; - n->inputs_num--; + sn_stage_cut (s, mask, n->stages); + } + + /* Use a copy of this member since it will be updated by + * sn_network_remove_input(). */ + inputs_num = n->inputs_num; + for (i = 0; i < inputs_num; i++) + { + if (mask[i] < 0) + sn_network_remove_input (n, 0); + else if (mask[i] > 0) + sn_network_remove_input (n, n->inputs_num - 1); + } return (0); -} /* }}} int sn_network_cut_at */ +} /* }}} int sn_network_cut */ /* sn_network_concatenate * @@ -340,20 +668,20 @@ static sn_network_t *sn_network_concatenate (sn_network_t *n0, /* {{{ */ if (i < n0->stages_num) for (j = 0; j < SN_STAGE_COMP_NUM (n0->stages[i]); j++) { - sn_comparator_t *c = SN_STAGE_COMP_GET (n0->stages[i], j); - sn_stage_comparator_add (s, c); + sn_comparator_t *c = SN_STAGE_COMP_GET (n0->stages[i], j); + sn_stage_comparator_add (s, c); } if (i < n1->stages_num) for (j = 0; j < SN_STAGE_COMP_NUM (n1->stages[i]); j++) { - sn_comparator_t *c_orig = SN_STAGE_COMP_GET (n1->stages[i], j); - sn_comparator_t c_copy; + sn_comparator_t *c_orig = SN_STAGE_COMP_GET (n1->stages[i], j); + sn_comparator_t c_copy; - SN_COMP_MIN(&c_copy) = SN_COMP_MIN(c_orig) + n0->inputs_num; - SN_COMP_MAX(&c_copy) = SN_COMP_MAX(c_orig) + n0->inputs_num; + SN_COMP_MIN(&c_copy) = SN_COMP_MIN(c_orig) + n0->inputs_num; + SN_COMP_MAX(&c_copy) = SN_COMP_MAX(c_orig) + n0->inputs_num; - sn_stage_comparator_add (s, &c_copy); + sn_stage_comparator_add (s, &c_copy); } sn_network_stage_add (n, s); @@ -362,225 +690,210 @@ static sn_network_t *sn_network_concatenate (sn_network_t *n0, /* {{{ */ return (n); } /* }}} sn_network_t *sn_network_concatenate */ -static int sn_network_add_bitonic_merger_recursive (sn_network_t *n, /* {{{ */ - int low, int num) +static int sn_network_add_bitonic_merger (sn_network_t *n, /* {{{ */ + int *indizes, int indizes_num) { - sn_stage_t *s; - int m; int i; - if (num == 1) + if (indizes_num <= 1) return (0); - s = sn_stage_create (n->stages_num); - if (s == NULL) - return (-1); + if (indizes_num > 2) + { + int even_indizes[indizes_num]; + int even_indizes_num; + int odd_indizes[indizes_num]; + int odd_indizes_num; + + even_indizes_num = (indizes_num + 1) / 2; + odd_indizes_num = indizes_num / 2; - m = num / 2; + for (i = 0; i < even_indizes_num; i++) + even_indizes[i] = indizes[2 * i]; + for (i = 0; i < odd_indizes_num; i++) + odd_indizes[i] = indizes[(2 * i) + 1]; - for (i = low; i < (low + m); i++) + sn_network_add_bitonic_merger (n, even_indizes, even_indizes_num); + sn_network_add_bitonic_merger (n, odd_indizes, odd_indizes_num); + } + + for (i = 1; i < indizes_num; i += 2) { sn_comparator_t c; - c.min = i; - c.max = i + m; + memset (&c, 0, sizeof (c)); + c.min = indizes[i - 1]; + c.max = indizes[i]; - sn_stage_comparator_add (s, &c); + sn_network_comparator_add (n, &c); } - sn_network_stage_add (n, s); - - sn_network_add_bitonic_merger_recursive (n, low, m); - sn_network_add_bitonic_merger_recursive (n, low + m, m); - return (0); -} /* }}} int sn_network_add_bitonic_merger_recursive */ +} /* }}} int sn_network_add_bitonic_merger */ -static int sn_network_add_bitonic_merger (sn_network_t *n) /* {{{ */ +static int sn_network_add_odd_even_merger (sn_network_t *n, /* {{{ */ + int *indizes_left, int indizes_left_num, + int *indizes_right, int indizes_right_num) { -#if 0 + int tmp_left[indizes_left_num]; + int tmp_left_num; + int tmp_right[indizes_left_num]; + int tmp_right_num; + int max_index; sn_stage_t *s; - int m; int i; - s = sn_stage_create (n->stages_num); - if (s == NULL) - return (-1); - - m = n->inputs_num / 2; - - for (i = 0; i < m; i++) + if ((indizes_left_num == 0) || (indizes_right_num == 0)) { - sn_comparator_t c; - - c.min = i; - c.max = n->inputs_num - (i + 1); - - sn_stage_comparator_add (s, &c); + return (0); } - - sn_network_stage_add (n, s); - - sn_network_add_bitonic_merger_recursive (n, 0, m); - sn_network_add_bitonic_merger_recursive (n, m, m); -#else - sn_network_add_bitonic_merger_recursive (n, 0, SN_NETWORK_INPUT_NUM (n)); -#endif - - return (0); -} /* }}} int sn_network_add_bitonic_merger */ - -static int sn_network_add_odd_even_merger_recursive (sn_network_t *n, /* {{{ */ - int *indizes, int indizes_num) -{ - if (indizes_num > 2) + else if ((indizes_left_num == 1) && (indizes_right_num == 1)) { sn_comparator_t c; sn_stage_t *s; - int indizes_half_num; - int *indizes_half; - int status; - int i; - indizes_half_num = indizes_num / 2; - indizes_half = (int *) malloc (indizes_num * sizeof (int)); - if (indizes_half == NULL) + c.min = *indizes_left; + c.max = *indizes_right; + + s = sn_stage_create (n->stages_num); + if (s == NULL) return (-1); - for (i = 0; i < indizes_half_num; i++) - { - indizes_half[i] = indizes[2 * i]; - indizes_half[indizes_half_num + i] = indizes[(2 * i) + 1]; - } + sn_stage_comparator_add (s, &c); + sn_network_stage_add (n, s); - status = sn_network_add_odd_even_merger_recursive (n, - indizes_half, indizes_half_num); - if (status != 0) - { - free (indizes_half); - return (status); - } + return (0); + } - status = sn_network_add_odd_even_merger_recursive (n, - indizes_half + indizes_half_num, indizes_half_num); - if (status != 0) - { - free (indizes_half); - return (status); - } + /* Merge odd sequences */ + tmp_left_num = (indizes_left_num + 1) / 2; + for (i = 0; i < tmp_left_num; i++) + tmp_left[i] = indizes_left[2 * i]; - free (indizes_half); + tmp_right_num = (indizes_right_num + 1) / 2; + for (i = 0; i < tmp_right_num; i++) + tmp_right[i] = indizes_right[2 * i]; - s = sn_stage_create (n->stages_num); - if (s == NULL) - return (-1); + sn_network_add_odd_even_merger (n, + tmp_left, tmp_left_num, + tmp_right, tmp_right_num); - for (i = 1; i < (indizes_num - 2); i += 2) - { - c.min = indizes[i]; - c.max = indizes[i + 1]; + /* Merge even sequences */ + tmp_left_num = indizes_left_num / 2; + for (i = 0; i < tmp_left_num; i++) + tmp_left[i] = indizes_left[(2 * i) + 1]; - sn_stage_comparator_add (s, &c); - } + tmp_right_num = indizes_right_num / 2; + for (i = 0; i < tmp_right_num; i++) + tmp_right[i] = indizes_right[(2 * i) + 1]; - sn_network_stage_add (n, s); - } + sn_network_add_odd_even_merger (n, + tmp_left, tmp_left_num, + tmp_right, tmp_right_num); + + /* Apply ``comparison-interchange'' operations. */ + s = sn_stage_create (n->stages_num); + + max_index = indizes_left_num + indizes_right_num; + if ((max_index % 2) == 0) + max_index -= 3; else + max_index -= 2; + + for (i = 1; i <= max_index; i += 2) { sn_comparator_t c; - sn_stage_t *s; - assert (indizes_num == 2); - - c.min = indizes[0]; - c.max = indizes[1]; + if (i < indizes_left_num) + c.min = indizes_left[i]; + else + c.min = indizes_right[i - indizes_left_num]; - s = sn_stage_create (n->stages_num); - if (s == NULL) - return (-1); + if ((i + 1) < indizes_left_num) + c.max = indizes_left[i + 1]; + else + c.max = indizes_right[i + 1 - indizes_left_num]; sn_stage_comparator_add (s, &c); - sn_network_stage_add (n, s); } + sn_network_stage_add (n, s); + return (0); -} /* }}} int sn_network_add_odd_even_merger_recursive */ +} /* }}} int sn_network_add_odd_even_merger */ -static int sn_network_add_odd_even_merger (sn_network_t *n) /* {{{ */ +sn_network_t *sn_network_combine_bitonic_merge (sn_network_t *n0, /* {{{ */ + sn_network_t *n1) { - int *indizes; - int indizes_num; - int status; + sn_network_t *n0_clone; + sn_network_t *n; + int indizes_num = SN_NETWORK_INPUT_NUM (n0) + SN_NETWORK_INPUT_NUM (n1); + int indizes[indizes_num]; int i; - indizes_num = n->inputs_num; - indizes = (int *) malloc (indizes_num * sizeof (int)); - if (indizes == NULL) - return (-1); + /* We need to invert n0, because the sequence must be + * z_1 >= z_2 >= ... >= z_k <= z_{k+1} <= ... <= z_p + * and NOT the other way around! Otherwise the comparators added in + * sn_network_add_bitonic_merger() from comparing (z_0,z_1), (z_2,z_3), ... + * to comparing ..., (z_{n-4},z_{n-3}), (z_{n-2},z_{n-1}), i.e. bound to the + * end of the list, possibly leaving z_0 uncompared. */ + n0_clone = sn_network_clone (n0); + if (n0_clone == NULL) + return (NULL); + sn_network_invert (n0_clone); + + n = sn_network_concatenate (n0_clone, n1); + if (n == NULL) + return (NULL); + sn_network_destroy (n0_clone); for (i = 0; i < indizes_num; i++) indizes[i] = i; - status = sn_network_add_odd_even_merger_recursive (n, - indizes, indizes_num); - - free (indizes); - return (status); -} /* }}} int sn_network_add_bitonic_merger */ + sn_network_add_bitonic_merger (n, indizes, indizes_num); -static sn_network_t *sn_network_combine_bitonic (sn_network_t *n0, /* {{{ */ + return (n); +} /* }}} sn_network_t *sn_network_combine_bitonic_merge */ + +sn_network_t *sn_network_combine_odd_even_merge (sn_network_t *n0, /* {{{ */ sn_network_t *n1) { sn_network_t *n; - sn_network_t *n1_clone; - int shift; - - n1_clone = sn_network_clone (n1); - if (n1_clone == NULL) - return (NULL); + int indizes_left[n0->inputs_num]; + int indizes_left_num; + int indizes_right[n1->inputs_num]; + int indizes_right_num; + int status; + int i; - sn_network_invert (n1_clone); + indizes_left_num = n0->inputs_num; + indizes_right_num = n1->inputs_num; + for (i = 0; i < indizes_left_num; i++) + indizes_left[i] = i; + for (i = 0; i < indizes_right_num; i++) + indizes_right[i] = indizes_left_num + i; - n = sn_network_concatenate (n0, n1_clone); + n = sn_network_concatenate (n0, n1); if (n == NULL) return (NULL); - sn_network_destroy (n1_clone); - - shift = sn_bounded_random (0, SN_NETWORK_INPUT_NUM (n) - 1); - if (shift > 0) + status = sn_network_add_odd_even_merger (n, + indizes_left, indizes_left_num, + indizes_right, indizes_right_num); + if (status != 0) { - DPRINTF ("sn_network_combine_bitonic: Shifting by %i.\n", shift); - sn_network_shift (n, shift); + sn_network_destroy (n); + return (NULL); } - sn_network_add_bitonic_merger (n); - + sn_network_compress (n); return (n); -} /* }}} sn_network_t *sn_network_combine_bitonic */ +} /* }}} sn_network_t *sn_network_combine_odd_even_merge */ sn_network_t *sn_network_combine (sn_network_t *n0, /* {{{ */ sn_network_t *n1) { - sn_network_t *n; - - if (sn_bounded_random (0, 2) < 2) - { - DPRINTF ("sn_network_combine: Using the bitonic merger.\n"); - n = sn_network_combine_bitonic (n0, n1); - } - else - { - DPRINTF ("sn_network_combine: Using the odd-even merger.\n"); - n = sn_network_concatenate (n0, n1); - if (n == NULL) - return (NULL); - sn_network_add_odd_even_merger (n); - } - - sn_network_compress (n); - - return (n); + return (sn_network_combine_odd_even_merge (n0, n1)); } /* }}} sn_network_t *sn_network_combine */ int sn_network_sort (sn_network_t *n, int *values) /* {{{ */ @@ -623,7 +936,7 @@ int sn_network_brute_force_check (sn_network_t *n) /* {{{ */ for (i = 1; i < n->inputs_num; i++) { if (previous > values[i]) - return (1); + return (1); previous = values[i]; } @@ -633,14 +946,14 @@ int sn_network_brute_force_check (sn_network_t *n) /* {{{ */ { if (test_pattern[i] == 0) { - test_pattern[i] = 1; - overflow = 0; - break; + test_pattern[i] = 1; + overflow = 0; + break; } else { - test_pattern[i] = 0; - overflow = 1; + test_pattern[i] = 0; + overflow = 1; } } @@ -667,7 +980,7 @@ sn_network_t *sn_network_read (FILE *fh) /* {{{ */ int buffer_len = strlen (buffer); while ((buffer_len > 0) && ((buffer[buffer_len - 1] == '\n') - || (buffer[buffer_len - 1] == '\r'))) + || (buffer[buffer_len - 1] == '\r'))) { buffer_len--; buffer[buffer_len] = '\0'; @@ -775,7 +1088,7 @@ int sn_network_serialize (sn_network_t *n, char **ret_buffer, /* {{{ */ #define SNPRINTF_OR_FAIL(...) \ status = snprintf (buffer, buffer_size, __VA_ARGS__); \ - if ((status < 1) || (status >= buffer_size)) \ + if ((status < 1) || (((size_t) status) >= buffer_size)) \ return (-1); \ buffer += status; \ buffer_size -= status; @@ -874,4 +1187,20 @@ sn_network_t *sn_network_unserialize (char *buffer, /* {{{ */ return (n); } /* }}} sn_network_t *sn_network_unserialize */ +uint32_t sn_network_get_hashval (const sn_network_t *n) /* {{{ */ +{ + uint32_t hash; + int i; + + if (n == NULL) + return (0); + + hash = (uint32_t) n->inputs_num; + + for (i = 0; i < n->stages_num; i++) + hash = (hash * 104207) + sn_stage_get_hashval (n->stages[i]); + + return (hash); +} /* }}} uint32_t sn_network_get_hashval */ + /* vim: set sw=2 sts=2 et fdm=marker : */