From: Florian Forster <octo@leeloo.octo.it>
Date: Tue, 21 Dec 2010 08:35:56 +0000 (+0100)
Subject: Rename "sn-pairwise" to "sn-pairwisesort".
X-Git-Tag: v1.0.0~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=aa1cdcc8164fc002497203f7354ad377f6a65624;p=sort-networks.git

Rename "sn-pairwise" to "sn-pairwisesort".
---

diff --git a/README b/README
index 61e90d1..afac4ac 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ The distribution includes the following utility programs:
     Creates an odd-even mergesort network with a given number of inputs and
     prints the network to STDOUT.
 
-  * sn-pairwise
+  * sn-pairwisesort
     Create a pairwise sorting network based on the paper by Ian Parberry.
 
   * sn-shmoo
diff --git a/src/Makefile.am b/src/Makefile.am
index aa0f298..8923b41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libsortnetwork.la
 
 bin_PROGRAMS = sn-apply sn-bitonicsort sn-bb sn-bb-merge sn-check-bf sn-cut \
 	       sn-info sn-markov sn-merge sn-normalize \
-	       sn-oddevenmerge sn-oddevensort sn-pairwise \
+	       sn-oddevenmerge sn-oddevensort sn-pairwisesort \
 	       sn-shmoo sn-show sn-svg sn-tex
 
 libsortnetwork_la_SOURCES = sn_network.c sn_network.h       \
@@ -50,8 +50,8 @@ sn_oddevenmerge_LDADD = libsortnetwork.la
 sn_oddevensort_SOURCES = sn-oddevensort.c
 sn_oddevensort_LDADD = libsortnetwork.la
 
-sn_pairwise_SOURCES = sn-pairwise.c
-sn_pairwise_LDADD = libsortnetwork.la
+sn_pairwisesort_SOURCES = sn-pairwisesort.c
+sn_pairwisesort_LDADD = libsortnetwork.la
 
 sn_shmoo_SOURCES = sn-shmoo.c
 sn_shmoo_LDADD = libsortnetwork.la
diff --git a/src/sn-pairwise.c b/src/sn-pairwise.c
deleted file mode 100644
index 99079d5..0000000
--- a/src/sn-pairwise.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * libsortnetwork - src/sn-pairwise.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 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.
- *
- * 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
- *
- * Authors:
- *   Florian octo Forster <ff at octo.it>
- **/
-
-#ifndef _ISOC99_SOURCE
-# define _ISOC99_SOURCE
-#endif
-#ifndef _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE 200112L
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "sn_network.h"
-
-int main (int argc, char **argv)
-{
-  sn_network_t *n;
-  size_t inputs_num;
-
-  if (argc != 2)
-  {
-    printf ("Usage: %s <num inputs>\n", argv[0]);
-    return (0);
-  }
-
-  inputs_num = (size_t) atoi (argv[1]);
-  if (inputs_num < 2)
-  {
-    fprintf (stderr, "Invalid number of inputs: %zu\n", inputs_num);
-    return (1);
-  }
-
-  n = sn_network_create_pairwise (inputs_num);
-  if (n == NULL)
-  {
-    printf ("n == NULL!\n");
-    return (1);
-  }
-
-  sn_network_write (n, stdout);
-
-  return (0);
-} /* int main */
-
-/* vim: set shiftwidth=2 softtabstop=2 : */
diff --git a/src/sn-pairwisesort.c b/src/sn-pairwisesort.c
new file mode 100644
index 0000000..6512e69
--- /dev/null
+++ b/src/sn-pairwisesort.c
@@ -0,0 +1,64 @@
+/**
+ * libsortnetwork - src/sn-pairwisesort.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 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.
+ *
+ * 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
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "sn_network.h"
+
+int main (int argc, char **argv)
+{
+  sn_network_t *n;
+  size_t inputs_num;
+
+  if (argc != 2)
+  {
+    printf ("Usage: %s <num inputs>\n", argv[0]);
+    return (0);
+  }
+
+  inputs_num = (size_t) atoi (argv[1]);
+  if (inputs_num < 2)
+  {
+    fprintf (stderr, "Invalid number of inputs: %zu\n", inputs_num);
+    return (1);
+  }
+
+  n = sn_network_create_pairwise (inputs_num);
+  if (n == NULL)
+  {
+    printf ("n == NULL!\n");
+    return (1);
+  }
+
+  sn_network_write (n, stdout);
+
+  return (0);
+} /* int main */
+
+/* vim: set shiftwidth=2 softtabstop=2 : */