Browse Source

rename to counting sort

pull/28/head
Chris Cromer 2 years ago
parent
commit
02ea6050e9
Signed by: cromer GPG Key ID: 39CC813FF3C8708A
6 changed files with 18 additions and 18 deletions
  1. +1
    -1
      Makefile
  2. +1
    -1
      src/counting_sort.c
  3. +3
    -3
      src/include/counting_sort.h
  4. +9
    -9
      src/sort.c
  5. +1
    -1
      test/Makefile
  6. +3
    -3
      test/test.c

+ 1
- 1
Makefile View File

@ -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


src/count_sort.c → src/counting_sort.c View File


src/include/count_sort.h → src/include/counting_sort.h View File


+ 9
- 9
src/sort.c View File

@ -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();


+ 1
- 1
test/Makefile View File

@ -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


+ 3
- 3
test/test.c View File

@ -19,7 +19,7 @@
#include <unistd.h>
#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++) {


Loading…
Cancel
Save