diff --git a/TP1/main b/TP1/main index 7ee5fdf9813d85b07241aeccf17b3b50a3794140..be57b07d0f235c87329d251cf13d8e044e8bcf82 100755 Binary files a/TP1/main and b/TP1/main differ diff --git a/TP1/main.c b/TP1/main.c index 603dad612b3d0a74e93ecff63acae99c67462f46..8730ecf3c6bedf923cb323d46de86b4b5b772dbe 100644 --- a/TP1/main.c +++ b/TP1/main.c @@ -12,7 +12,8 @@ int main() { affichertab(T1,5); printf("\n"); - triInsertion(T1,5); + //triInsertion(T1,5); + triFusion(T1, 5); affichertab(T1,5); diff --git a/TP1/tris.c b/TP1/tris.c index 277e391b806ae698f297fbf47808c5dd8ef6d153..5d0eaf878dd581a3d2bf6086005eb5be29d5db02 100644 --- a/TP1/tris.c +++ b/TP1/tris.c @@ -21,7 +21,7 @@ void triFusion(long* A, size_t size) { } void sousTriFusion(long* A, size_t first, size_t size) { - if(first<size-1){ + if(first+1 <size){ // p < r - 1 size_t middle = floor((first+size)/2); sousTriFusion(A, first, middle); sousTriFusion(A, middle, size); diff --git a/TP1/tris.o b/TP1/tris.o new file mode 100644 index 0000000000000000000000000000000000000000..1afaba8c5e48d9b8a7900cdf5d56066d74f88a94 Binary files /dev/null and b/TP1/tris.o differ diff --git a/TP1/utils.o b/TP1/utils.o new file mode 100644 index 0000000000000000000000000000000000000000..95f6e18aa652033c445c466ecc38da865e5aa1f8 Binary files /dev/null and b/TP1/utils.o differ