diff --git a/TP1/main b/TP1/main index f2cec69342b07a11fc059b2a84a1454851c91dc6..17d53ea487d73396a3d9f621ad993dd66c3005bf 100755 Binary files a/TP1/main and b/TP1/main differ diff --git a/TP1/main.c b/TP1/main.c index 33eb5c74faf61bb6ae90796ce509b53ce00a5ff4..41153dbd1e1f8e624e3813f728b752a1b135d61f 100644 --- a/TP1/main.c +++ b/TP1/main.c @@ -5,9 +5,9 @@ int main() { - int T1[5] ={3,2,5,1,4} ; + long T1[5] ={3,2,5,1,4} ; - int T2[8] ={3,2,8,4,1,6,7,5} ; + long T2[8] ={3,2,8,4,1,6,7,5} ; affichertab(T1,5); printf("\n"); diff --git a/TP1/main.o b/TP1/main.o index 8464bcd59095a6d7cbc6b806c1654117a496018c..f3e50fc623761e718ca7058f5f8306e8431117f0 100644 Binary files a/TP1/main.o and b/TP1/main.o differ diff --git a/TP1/tris.c b/TP1/tris.c index 32cf264215b02b90acae25ec29ab99c89245dc3e..d0c4aa5142015c59f21133fee560b3188e7b78df 100644 --- a/TP1/tris.c +++ b/TP1/tris.c @@ -2,13 +2,13 @@ #include <math.h> #include <stdlib.h> -void triInsertion(int* A, int n){ - for(int i = 1; i <= n-1; i++){ - int cle = A[i]; - int j = i - 1; - while(j >= 0 && A[j] > cle){ +void triInsertion(long* A, size_t n){ + for(size_t i = 1; i <= n-1; i++){ + long cle = A[i]; + size_t j = i - 1; + while(j+1 >= j && A[j] > cle){ A[j+1] = A[j]; - j--; + j = j-1; } A[j+1] = cle; } diff --git a/TP1/tris.h b/TP1/tris.h index cc5056aa7a2deaa967eb8be1535a2b5d2fa76e3d..9a671bb22d393ffddfcfceefde6c9f3a0a94f988 100644 --- a/TP1/tris.h +++ b/TP1/tris.h @@ -1,4 +1,5 @@ #include <stdint.h> +#include <stdlib.h> -void triInsertion(int* A, int n); \ No newline at end of file +void triInsertion(long* A, size_t n); \ No newline at end of file diff --git a/TP1/tris.o b/TP1/tris.o index a3890e82c9e166c03965a7b9efda9c1944185287..bdaa4d561577bb95fa5d5fba75e96fe2bb9050b1 100644 Binary files a/TP1/tris.o and b/TP1/tris.o differ diff --git a/TP1/utils.c b/TP1/utils.c index f68b0b38139e3ba20612c79aa938299711317102..df560764a6b806fd80a4123d6664b2804537493a 100644 --- a/TP1/utils.c +++ b/TP1/utils.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include "utils.h" -void affichertab(int* T, int s){ +void affichertab(long* T, int s){ for(int i = 0; i < s; i++){ printf("%d \n",T[i]); } diff --git a/TP1/utils.h b/TP1/utils.h index 4313661243edd1c568cae444cec84ab117585509..9bc1d220ac2380c3a1096bf8c7205dcd3e8bc196 100644 --- a/TP1/utils.h +++ b/TP1/utils.h @@ -1,4 +1,4 @@ #include <stdio.h> #include <stdlib.h> -void affichertab(int* T, int s); \ No newline at end of file +void affichertab(long* T, int s); \ No newline at end of file diff --git a/TP1/utils.o b/TP1/utils.o index 93cbf075995584b2edc7a921e5d6e4568a023c27..6d511603b9af0af8e04312df9d3b5e3783f080c9 100644 Binary files a/TP1/utils.o and b/TP1/utils.o differ