diff --git a/makefile b/makefile index 2f1fa919195a6c82eb420a976f3bf83424f42a34..a98c276a905335584c025b32977c1ffd0b846df3 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ all: main triFusion triInsertion triRapide -main: main.c tris.o +main: main.c tris.o utils.o gcc -Wall -o $@ $^ %.o: %.c diff --git a/tris.c b/tris.c index 3a1b14f9ba55c58b9aabb2ef7314a5fd03883121..77d002bdb2b6d6d63e0ce5a9dd0cfd2eb4b856fc 100644 --- a/tris.c +++ b/tris.c @@ -1,11 +1,5 @@ #include "tris.h" -void copierTableau(long* dest,long* src,size_t n){ - for(size_t i = 0;i < n;i++){ - dest[i] = src[i]; - } -} - void fusion(long* A,size_t p,size_t q,size_t r){ size_t n1 = q-p; size_t n2 = r-q; @@ -49,17 +43,6 @@ void triFusion(long* A,size_t n){ sousTriFusion(A,0,n); } -void printTab(long* A,size_t n){ - printf("{"); - for(size_t i = 0;i < n;i++){ - if(i != 0){ - printf(","); - } - printf("%ld",A[i]); - } - printf("}\n"); -} - void triInsertion(long* A, size_t n){ for(size_t i = 1; i < n; i ++){ long cle = A[i]; @@ -72,12 +55,6 @@ void triInsertion(long* A, size_t n){ } } -void permuter(long* a,long* b){ - long tmp = *a; - *a = *b; - *b = tmp; -} - size_t partition(long* A,size_t p,size_t r){ long pivot = A[r-1]; size_t i = p; diff --git a/tris.h b/tris.h index d9bb60d6a6a3ffb2c7ea0d13aaee0c49f7241dc4..ebbe9061b18748bffefa59f6a33d8922cc12cd63 100644 --- a/tris.h +++ b/tris.h @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> -void copierTableau(long* dest,long* src,size_t n); +#include "utils.h" void fusion(long* A,size_t p,size_t q,size_t r); @@ -9,12 +9,8 @@ void sousTriFusion(long* A,size_t p,size_t r); void triFusion(long* A,size_t n); -void printTab(long* A,size_t n); - void triInsertion(long* A, size_t n); -void permuter(long* a,long* b); - size_t partition(long* A,size_t p,size_t r); void sousTriRapide(long* A,size_t p,size_t r);