From 02ea6050e9c288cf7416f2cc008370a1149951b6 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Tue, 20 Nov 2018 12:16:29 -0300 Subject: [PATCH] rename to counting sort --- Makefile | 2 +- src/{count_sort.c => counting_sort.c} | 2 +- src/include/{count_sort.h => counting_sort.h} | 6 +++--- src/sort.c | 18 +++++++++--------- test/Makefile | 2 +- test/test.c | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) rename src/{count_sort.c => counting_sort.c} (98%) rename src/include/{count_sort.h => counting_sort.h} (94%) diff --git a/Makefile b/Makefile index df27027..eb10ead 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ CC=gcc CFLAGS=-Wall -Isrc/include -DDEBUG -g LDFLAGS=-lm -SRC=src/sort.c src/random.c src/bubble_sort.c src/timer.c src/count_sort.c src/quick_sort.c src/merge_sort.c src/bitonic_sort.c src/selection_sort.c +SRC=src/sort.c src/random.c src/bubble_sort.c src/timer.c src/counting_sort.c src/quick_sort.c src/merge_sort.c src/bitonic_sort.c src/selection_sort.c OBJ=$(SRC:.c=.o) all: sort informe diff --git a/src/count_sort.c b/src/counting_sort.c similarity index 98% rename from src/count_sort.c rename to src/counting_sort.c index 6ba0c3f..3aca154 100644 --- a/src/count_sort.c +++ b/src/counting_sort.c @@ -22,7 +22,7 @@ * @param array El array a ordenar * @param n El tamaño del array */ -void count_sort(int *array, int n) { +void counting_sort(int *array, int n) { int i; int j; int *temp = malloc(sizeof(int) * n); diff --git a/src/include/count_sort.h b/src/include/counting_sort.h similarity index 94% rename from src/include/count_sort.h rename to src/include/counting_sort.h index 222a167..0d0053d 100644 --- a/src/include/count_sort.h +++ b/src/include/counting_sort.h @@ -13,7 +13,7 @@ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _SORT_COUNT - #define _SORT_COUNT - void count_sort(int *array, int n); +#ifndef _SORT_COUNTING + #define _SORT_COUNTING + void counting_sort(int *array, int n); #endif diff --git a/src/sort.c b/src/sort.c index fdb8e04..89a882c 100644 --- a/src/sort.c +++ b/src/sort.c @@ -22,7 +22,7 @@ #include "random.h" #include "timer.h" #include "bubble_sort.h" -#include "count_sort.h" +#include "counting_sort.h" #include "quick_sort.h" #include "bitonic_sort.h" #include "selection_sort.h" @@ -49,7 +49,7 @@ void print_usage() { fprintf(stdout, " -q, --quick usar quick sort\n"); fprintf(stdout, " -b, --bubble usar bubble sort\n"); fprintf(stdout, " -B, --bitonic usar bitonic sort\n"); - fprintf(stdout, " -c, --count usar ordenamiento por conteo\n"); + fprintf(stdout, " -c, --counting usar ordenamiento por conteo\n"); fprintf(stdout, " -s, --selection usar ordenamiento por selección\n"); fprintf(stdout, " -n, --n=N la cantidad de elementos a ordenar, la\n"); fprintf(stdout, " cantidad predeterminado es 10\n"); @@ -183,7 +183,7 @@ int main (int argc, char **argv) { int quick = 0; int bubble = 0; int bitonic = 0; - int count = 0; + int counting = 0; int selection = 0; int opt; int long_index = 0; @@ -193,7 +193,7 @@ int main (int argc, char **argv) { {"quick", no_argument, 0, 'q'}, {"bubble", no_argument, 0, 'b'}, {"bitonic", no_argument, 0, 'B'}, - {"count", no_argument, 0, 'c'}, + {"counting", no_argument, 0, 'c'}, {"selection", no_argument, 0, 's'}, {"n", required_argument, 0, 'n'}, {"elegir", no_argument, 0, 'e'}, @@ -215,7 +215,7 @@ int main (int argc, char **argv) { quick = 1; bubble = 1; bitonic = 1; - count = 1; + counting = 1; selection = 1; break; case 'm': @@ -231,7 +231,7 @@ int main (int argc, char **argv) { bitonic = 1; break; case 'c': - count = 1; + counting = 1; break; case 's': selection = 1; @@ -296,7 +296,7 @@ int main (int argc, char **argv) { } } - if (!merge && !quick && !bubble && !bitonic && !count && !selection) { + if (!merge && !quick && !bubble && !bitonic && !counting && !selection) { fprintf(stderr, "Error: No se seleccionó un algoritmo valido!\n"); print_usage(); return 4; @@ -351,8 +351,8 @@ int main (int argc, char **argv) { end_sort(); } - // O(n^2) - if (count) { + // O((1/2) * n^2 - (1/2) * n) + if (counting) { start_sort("Count sort corriendo... ", n); count_sort(work_array, n); end_sort(); diff --git a/test/Makefile b/test/Makefile index fc1b030..444028d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ CFLAGS=-Wall -I../src/include -DDEBUG -g SRC=test.c OBJ=$(SRC:.c=.o) -OBJ+=../src/random.o ../src/bubble_sort.o ../src/count_sort.o ../src/quick_sort.o ../src/merge_sort.o ../src/bitonic_sort.o ../src/selection_sort.o +OBJ+=../src/random.o ../src/bubble_sort.o ../src/counting_sort.o ../src/quick_sort.o ../src/merge_sort.o ../src/bitonic_sort.o ../src/selection_sort.o all: test diff --git a/test/test.c b/test/test.c index f36e428..5cf3faf 100644 --- a/test/test.c +++ b/test/test.c @@ -19,7 +19,7 @@ #include #include "random.h" #include "bubble_sort.h" -#include "count_sort.h" +#include "counting_sort.h" #include "selection_sort.h" #include "bitonic_sort.h" #include "merge_sort.h" @@ -124,10 +124,10 @@ int main(int argc, char **argv) { passed++; } - // Test count sort + // Test counting sort pass = 1; memcpy(test_array, test_case, sizeof(int) * n); - fprintf(stdout, "\tcount sort: "); + fprintf(stdout, "\tcounting sort: "); fflush(stdout); count_sort(test_array, n); for (i = 0; i < n; i++) {