From d602a8356687728b0973eeb6d4b6da881238f89c Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.octo.it>
Date: Tue, 21 Dec 2010 09:33:52 +0100
Subject: [PATCH] Rename "sn-batcher" to "sn-bitonicsort".

---
 README                                 | 7 +++----
 src/Makefile.am                        | 8 ++++----
 src/{sn-batcher.c => sn-bitonicsort.c} | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename src/{sn-batcher.c => sn-bitonicsort.c} (98%)

diff --git a/README b/README
index 11eb0e3..61e90d1 100644
--- a/README
+++ b/README
@@ -19,10 +19,9 @@ The distribution includes the following utility programs:
     Reads a list of values from STDIN and applies a given comparator network to
     the list. The resulting list of printed to STDOUT.
 
-  * sn-batcher
-    Creates a batcher bitonic-merge-sort network with a given number of inputs
-    and prints the network to STDOUT. The number of inputs must be a power of
-    two.
+  * sn-bitonicsort
+    Creates a bitonic mergesort network with a given number of inputs and
+    prints the network to STDOUT. The number of inputs must be a power of two.
 
   * sn-check-bf
     Does a brute-force check whether a given comparator network is a sort
diff --git a/src/Makefile.am b/src/Makefile.am
index e30ca07..aa0f298 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ include_HEADERS = sn_network.h sn_stage.h sn_comparator.h
 
 lib_LTLIBRARIES = libsortnetwork.la
 
-bin_PROGRAMS = sn-apply sn-batcher sn-bb sn-bb-merge sn-check-bf sn-cut \
+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-shmoo sn-show sn-svg sn-tex
@@ -16,9 +16,6 @@ libsortnetwork_la_LDFLAGS = -version-info 0:0:0
 sn_apply_SOURCES = sn-apply.c
 sn_apply_LDADD = libsortnetwork.la
 
-sn_batcher_SOURCES = sn-batcher.c
-sn_batcher_LDADD = libsortnetwork.la
-
 sn_bb_SOURCES = sn-bb.c
 sn_bb_LDADD = libsortnetwork.la -lm
 
@@ -26,6 +23,9 @@ sn_bb_merge_SOURCES = sn-bb.c
 sn_bb_merge_CPPFLAGS = $(AM_CPPFLAGS) -DBUILD_MERGE=1
 sn_bb_merge_LDADD = libsortnetwork.la -lm
 
+sn_bitonicsort_SOURCES = sn-bitonicsort.c
+sn_bitonicsort_LDADD = libsortnetwork.la
+
 sn_check_bf_SOURCES = sn-check-bf.c
 sn_check_bf_LDADD = libsortnetwork.la
 
diff --git a/src/sn-batcher.c b/src/sn-bitonicsort.c
similarity index 98%
rename from src/sn-batcher.c
rename to src/sn-bitonicsort.c
index 13f6d8e..9a69dc2 100644
--- a/src/sn-batcher.c
+++ b/src/sn-bitonicsort.c
@@ -1,5 +1,5 @@
 /**
- * libsortnetwork - src/sn-batcher.c
+ * libsortnetwork - src/sn-bitonicsort.c
  * Copyright (C) 2008-2010  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
-- 
2.11.0