diff --git a/TP1/Makefile b/TP1/Makefile index a3647b0707bfe3d085594054b59af78a79c1b6e2..851e4b282cedad31be948cad07998cd132a00bf3 100644 --- a/TP1/Makefile +++ b/TP1/Makefile @@ -1,10 +1,13 @@ -main: main.o tris.o - gcc -o main main.o tris.o +main: main.o tris.o utils.o + gcc -o main main.o tris.o utils.o main.o : main.c gcc -o main.o -c main.c tris.o : tris.c tris.h gcc -o tris.o -c tris.c +utils.o : utils.c utils.h + gcc -o utils.o -c utils.c + clean : rm *.o diff --git a/TP1/main b/TP1/main index 0959b206f91551144dbd06392129555ed1c6dc2c..f2cec69342b07a11fc059b2a84a1454851c91dc6 100755 Binary files a/TP1/main and b/TP1/main differ diff --git a/TP1/main.c b/TP1/main.c index 1394ce82a6799a1f5a895782014aed1fabc9d99f..33eb5c74faf61bb6ae90796ce509b53ce00a5ff4 100644 --- a/TP1/main.c +++ b/TP1/main.c @@ -1,5 +1,20 @@ #include <stdio.h> +#include <stdlib.h> +#include "tris.h" +#include "utils.h" + int main() { + int T1[5] ={3,2,5,1,4} ; + + int T2[8] ={3,2,8,4,1,6,7,5} ; + + affichertab(T1,5); + printf("\n"); + + triInsertion(T1,5); + + affichertab(T1,5); + return 0; } diff --git a/TP1/main.o b/TP1/main.o index bec93ecdf5ed2e1f094258621f16b474617ce573..8464bcd59095a6d7cbc6b806c1654117a496018c 100644 Binary files a/TP1/main.o and b/TP1/main.o differ diff --git a/TP1/tris.c b/TP1/tris.c index 339c195c2088e1e620282dfa00a93328912e0d6f..32cf264215b02b90acae25ec29ab99c89245dc3e 100644 --- a/TP1/tris.c +++ b/TP1/tris.c @@ -1,21 +1,15 @@ -triInsertion(A,n){ +#include "tris.h" +#include <math.h> +#include <stdlib.h> + +void triInsertion(int* A, int n){ for(int i = 1; i <= n-1; i++){ - clé = A[i]; - j = i - 1; - while(j >= 0 && A[j] > clé){ + int cle = A[i]; + int j = i - 1; + while(j >= 0 && A[j] > cle){ A[j+1] = A[j]; - j --; + j--; } - A[j+1] = clé; - } -} - -#include <math.h> - -sousTriFusion(A,p,r){ - if(p<r-1){ - q = floor((p+r)/2); - sousTriFusion(A,p,q); - sousTriFusion(A,p) + A[j+1] = cle; } } \ No newline at end of file diff --git a/TP1/tris.h b/TP1/tris.h index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cc5056aa7a2deaa967eb8be1535a2b5d2fa76e3d 100644 --- a/TP1/tris.h +++ b/TP1/tris.h @@ -0,0 +1,4 @@ +#include <stdint.h> + + +void triInsertion(int* A, int n); \ No newline at end of file diff --git a/TP1/tris.o b/TP1/tris.o index 0de1e591ec8ef184dc587670653ca3fafdf63d20..a3890e82c9e166c03965a7b9efda9c1944185287 100644 Binary files a/TP1/tris.o and b/TP1/tris.o differ diff --git a/TP1/utils.c b/TP1/utils.c new file mode 100644 index 0000000000000000000000000000000000000000..f68b0b38139e3ba20612c79aa938299711317102 --- /dev/null +++ b/TP1/utils.c @@ -0,0 +1,9 @@ +#include <stdio.h> +#include <stdlib.h> +#include "utils.h" + +void affichertab(int* T, int s){ + for(int i = 0; i < s; i++){ + printf("%d \n",T[i]); + } +} \ No newline at end of file diff --git a/TP1/utils.h b/TP1/utils.h new file mode 100644 index 0000000000000000000000000000000000000000..4313661243edd1c568cae444cec84ab117585509 --- /dev/null +++ b/TP1/utils.h @@ -0,0 +1,4 @@ +#include <stdio.h> +#include <stdlib.h> + +void affichertab(int* T, int s); \ No newline at end of file diff --git a/TP1/utils.o b/TP1/utils.o new file mode 100644 index 0000000000000000000000000000000000000000..93cbf075995584b2edc7a921e5d6e4568a023c27 Binary files /dev/null and b/TP1/utils.o differ