From 601b3c95cafa1683f95eb9d27107a6779983b127 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Tue, 13 Nov 2018 09:15:33 -0300 Subject: [PATCH] add count sort --- Makefile | 2 +- src/count_sort.c | 49 ++++++++++++++++++++++++++++++++++++++++ src/include/count_sort.h | 19 ++++++++++++++++ src/sort.c | 7 +++++- test/Makefile | 2 +- test/test.c | 28 +++++++++++++++++++---- 6 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 src/count_sort.c create mode 100644 src/include/count_sort.h diff --git a/Makefile b/Makefile index def505a..5d47608 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=src/sort.c src/random.c src/bubble_sort.c src/timer.c src/count_sort.c OBJ=$(SRC:.c=.o) all: sort informe diff --git a/src/count_sort.c b/src/count_sort.c new file mode 100644 index 0000000..dab32e6 --- /dev/null +++ b/src/count_sort.c @@ -0,0 +1,49 @@ +/* + * Copyright 2018 Christopher Cromer + * Copyright 2018 Rodolfo Cuevas + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * + * 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. + */ + +#include +#include + +#include + +/** + * Usar el algoritmo de ordenameniento por conteo + * @param array El array a ordenar + * @param n El tamaño del array + */ +void count_sort(int *array, int n) { + int i; + int j; + int *temp = malloc(sizeof(int) * n); + int *count = malloc(sizeof(int) * n); + memcpy(temp, array, sizeof(int) * n); + for (i = 0; i < n - 1; i++) { + for (j = i + 1; j < n; j++) { + if (temp[i] < temp[j]) { + count[j]++; + } + else { + count[i]++; + } + } + } + + for (i = 0; i < n; i++) { + array[count[i]] = temp[i]; + } + + free(count); + free(temp); +} diff --git a/src/include/count_sort.h b/src/include/count_sort.h new file mode 100644 index 0000000..222a167 --- /dev/null +++ b/src/include/count_sort.h @@ -0,0 +1,19 @@ +/* + * Copyright 2018 Christopher Cromer + * Copyright 2018 Rodolfo Cuevas + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * + * 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); +#endif diff --git a/src/sort.c b/src/sort.c index 4c353cf..1d08d23 100644 --- a/src/sort.c +++ b/src/sort.c @@ -19,6 +19,7 @@ #include "random.h" #include "timer.h" #include "bubble_sort.h" +#include "count_sort.h" #define SORT_VERSION "1.0.0" @@ -215,7 +216,11 @@ int main (int argc, char **argv) { // bitonic sort } else if (algoritmo == 4) { - // count sort + fprintf(stdout, "Count sort corriendo...\n"); + fflush(stdout); + start_timer(); + count_sort(array, n); + stop_timer(); } else if (algoritmo == 5) { // selection sort diff --git a/test/Makefile b/test/Makefile index 2b8cab0..2768c2f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -2,7 +2,7 @@ CC=gcc CFLAGS=-Wall -I../src/include -DDEBUG -g SRC=test.c OBJ=$(SRC:.c=.o) -OBJ+=../src/random.o ../src/bubble_sort.o ../src/timer.o +OBJ+=../src/random.o ../src/bubble_sort.o ../src/timer.o ../src/count_sort.o all: test diff --git a/test/test.c b/test/test.c index c79ec27..b15bdd1 100644 --- a/test/test.c +++ b/test/test.c @@ -19,6 +19,7 @@ #include #include "random.h" #include "bubble_sort.h" +#include "count_sort.h" static int *test_case; static int *test_array; @@ -50,7 +51,7 @@ int main(int argc, char **argv) { int n = 50000; int i; int gen; - int pass = 1; + int pass; int passed = 0; int failed = 0; @@ -63,6 +64,7 @@ int main(int argc, char **argv) { fprintf(stdout, "Running tests:\n"); // Test random number generation + pass = 1; fprintf(stdout, "\trandom generation: "); fflush(stdout); for (i = 0; i < 5000000; i++) { @@ -78,22 +80,22 @@ int main(int argc, char **argv) { fprintf(stdout, "pass\n"); passed++; } - pass = 1; // Prepare for sort tests for (i = 0; i < n; i++) { test_case[i] = gen_rand(-100, 100); } memcpy(qarray, test_case, sizeof(int) * n); - memcpy(test_array, test_case, sizeof(int) * n); qsort(qarray, n, sizeof(int), compar); // Test bubble sort + pass = 1; + memcpy(test_array, test_case, sizeof(int) * n); fprintf(stdout, "\tbubble sort: "); fflush(stdout); bubble_sort(test_array, n); for (i = 0; i < n; i++) { - if (test_array[i] != qarray[i] && pass) { + if (test_array[i] != qarray[i]) { fprintf(stdout, "fail\n"); failed++; pass = 0; @@ -104,7 +106,25 @@ int main(int argc, char **argv) { fprintf(stdout, "pass\n"); passed++; } + + // Test count sort pass = 1; + memcpy(test_array, test_case, sizeof(int) * n); + fprintf(stdout, "\tcount sort: "); + fflush(stdout); + count_sort(test_array, n); + for (i = 0; i < n; i++) { + if (test_array[i] != qarray[i]) { + fprintf(stdout, "fail\n"); + failed++; + pass = 0; + break; + } + } + if (pass) { + fprintf(stdout, "pass\n"); + passed++; + } fprintf(stdout, "%d tests passed\n", passed); fprintf(stdout, "%d tests failed\n", failed);