diff --git a/tp3/TP3.tgz b/tp3/TP3.tgz index 5518407..b5475d8 100644 Binary files a/tp3/TP3.tgz and b/tp3/TP3.tgz differ diff --git a/tp3/TP3/alloc.d b/tp3/TP3/alloc.d deleted file mode 100644 index f1b5d34..0000000 --- a/tp3/TP3/alloc.d +++ /dev/null @@ -1 +0,0 @@ -alloc.o: alloc.c alloc.h error.h diff --git a/tp3/TP3/alloc.o b/tp3/TP3/alloc.o deleted file mode 100644 index fc4440c..0000000 Binary files a/tp3/TP3/alloc.o and /dev/null differ diff --git a/tp3/TP3/main.d b/tp3/TP3/main.d deleted file mode 100644 index e5d17c1..0000000 --- a/tp3/TP3/main.d +++ /dev/null @@ -1,2 +0,0 @@ -main.o: main.c alloc.h error.h queuetest.h queue.h stacktest.h stack.h \ - testprint.h diff --git a/tp3/TP3/main.o b/tp3/TP3/main.o deleted file mode 100644 index 59d1259..0000000 Binary files a/tp3/TP3/main.o and /dev/null differ diff --git a/tp3/TP3/queue.c b/tp3/TP3/queue.c index eb953f1..6e5f976 100644 --- a/tp3/TP3/queue.c +++ b/tp3/TP3/queue.c @@ -101,7 +101,6 @@ void enqueue(int val, queue *p) { } int dequeue(queue *p) { - // print_queue(p); if (isempty_queue(p)) { FATAL("Pop on empty queue"); } @@ -119,7 +118,6 @@ int dequeue(queue *p) { p -> right = 0; return val; } - // printf("left = %d, right = %d size = %d\n", p -> left, p -> right, getsize_queue(p)); if (p -> left == p -> right + 1) { p -> empty = true; } diff --git a/tp3/TP3/queue.d b/tp3/TP3/queue.d deleted file mode 100644 index edd26a2..0000000 --- a/tp3/TP3/queue.d +++ /dev/null @@ -1 +0,0 @@ -queue.o: queue.c queue.h alloc.h error.h testprint.h stack.h diff --git a/tp3/TP3/queue.o b/tp3/TP3/queue.o deleted file mode 100644 index 66a26b7..0000000 Binary files a/tp3/TP3/queue.o and /dev/null differ diff --git a/tp3/TP3/queuetest.c b/tp3/TP3/queuetest.c index 31c8342..6168e16 100644 --- a/tp3/TP3/queuetest.c +++ b/tp3/TP3/queuetest.c @@ -9,7 +9,6 @@ queue *random_queue(int size, int maxval) { queue* p = create_queue(); for (int i = 0; i < size; i++) { enqueue(rand() % maxval, p); - // print_queue(p); } return p; } @@ -17,13 +16,9 @@ queue *random_queue(int size, int maxval) { queue *copy_queue(queue *p) { queue* p_out = create_queue(); for (int i = 0; i < getsize_queue(p); i++) { - // printf("left: %d right: %d size: %d\n", p -> left, p -> right, p -> size_array); int val = dequeue(p); - // printf("val: %d\n", val); enqueue(val, p); enqueue(val, p_out); - // print_queue(p); - // print_queue(p_out); } return p_out; } @@ -32,7 +27,6 @@ queue *mountain_queue(int n) { queue* p = create_queue(); for (int i = 0; i < n; i++) { enqueue(n - i, p); - // print_queue(p); } return p; } diff --git a/tp3/TP3/queuetest.d b/tp3/TP3/queuetest.d deleted file mode 100644 index 760c521..0000000 --- a/tp3/TP3/queuetest.d +++ /dev/null @@ -1,2 +0,0 @@ -queuetest.o: queuetest.c queuetest.h queue.h alloc.h error.h testprint.h \ - stack.h diff --git a/tp3/TP3/queuetest.o b/tp3/TP3/queuetest.o deleted file mode 100644 index ec05e15..0000000 Binary files a/tp3/TP3/queuetest.o and /dev/null differ diff --git a/tp3/TP3/stack.d b/tp3/TP3/stack.d deleted file mode 100644 index 6366f94..0000000 --- a/tp3/TP3/stack.d +++ /dev/null @@ -1 +0,0 @@ -stack.o: stack.c stack.h alloc.h error.h diff --git a/tp3/TP3/stack.o b/tp3/TP3/stack.o deleted file mode 100644 index 0a0b26a..0000000 Binary files a/tp3/TP3/stack.o and /dev/null differ diff --git a/tp3/TP3/stackqueue b/tp3/TP3/stackqueue deleted file mode 100755 index 1412cd4..0000000 Binary files a/tp3/TP3/stackqueue and /dev/null differ diff --git a/tp3/TP3/stacktest.c b/tp3/TP3/stacktest.c index c5a7667..94dccfa 100644 --- a/tp3/TP3/stacktest.c +++ b/tp3/TP3/stacktest.c @@ -45,7 +45,6 @@ void hanoi(int n) { int max = n; int *count = 0; hanoi_rec(p1, p2, p3, p1, p2, p3, n, max, count); - print_stacks(max, 3, p1, p2, p3); return; } @@ -53,11 +52,9 @@ void hanoi_rec(stack *p1, stack *p2, stack *p3, stack *q1, stack *q2, stack *q3, int n, int max, int *count) { if (n == 0) { - // print_stacks(max, 3, q1, q2, q3); return; }; hanoi_rec(p1, p3, p2, q1, q2, q3, n-1, max, count); - print_stacks(max, 3, q1, q2, q3); push(pop(p1), p3); hanoi_rec(p2, p1, p3, q1, q2, q3, n-1, max, count); return; @@ -70,7 +67,6 @@ void bubble_sort_stack(stack *p) { for (int j = 0; j < n - 1; j++) { push(pop(p), p_aux); } - print_stacks(n - i, 2, p, p_aux); for (int j = i; j < n - 1; j++) { int a = pop(p); int b = pop(p_aux); @@ -85,7 +81,6 @@ void bubble_sort_stack(stack *p) { for (int j = 0; j < i; j++) { push(pop(p_aux), p); } - printf("\n"); } delete_stack(p_aux); return; diff --git a/tp3/TP3/stacktest.d b/tp3/TP3/stacktest.d deleted file mode 100644 index 36f2dae..0000000 --- a/tp3/TP3/stacktest.d +++ /dev/null @@ -1,2 +0,0 @@ -stacktest.o: stacktest.c stacktest.h stack.h alloc.h error.h testprint.h \ - queue.h diff --git a/tp3/TP3/stacktest.o b/tp3/TP3/stacktest.o deleted file mode 100644 index 0a2ecc7..0000000 Binary files a/tp3/TP3/stacktest.o and /dev/null differ diff --git a/tp3/TP3/testprint.d b/tp3/TP3/testprint.d deleted file mode 100644 index 902e6a7..0000000 --- a/tp3/TP3/testprint.d +++ /dev/null @@ -1 +0,0 @@ -testprint.o: testprint.c testprint.h alloc.h error.h queue.h stack.h diff --git a/tp3/TP3/testprint.o b/tp3/TP3/testprint.o deleted file mode 100644 index 69db6ce..0000000 Binary files a/tp3/TP3/testprint.o and /dev/null differ