diff --git a/TP1/main b/TP1/main index 75f172ca0fc8ef762645823292ccba0db606b930..d1487facee325fdb0d5f18151a49b23445190c91 100755 Binary files a/TP1/main and b/TP1/main differ diff --git a/TP1/tris.h b/TP1/tris.h index 619574b5c18b48d56c2b4edcda927e594c7e8867..9841ffb6e67d3ae291493953eb6087b81d284159 100644 --- a/TP1/tris.h +++ b/TP1/tris.h @@ -1,17 +1,17 @@ -#ifndef TRIS_H -#define TRIS_H -#include <stdint.h> -#include <stdlib.h> - -void triInsertion(long* A, size_t n); - -void triFusion(long* A, size_t size); -void sousTriFusion(long* A, size_t first, size_t size); -void fusion(long* A, size_t first, size_t middle, size_t size); - -void triRapide(long* A, size_t n); -void sousTriRapide(long* A, size_t first, size_t size); -size_t partition(long* A, size_t first, size_t size); -void permuter(long* A,size_t i,size_t j); - -#endif //TRIS_H +#ifndef TRIS_H +#define TRIS_H +#include <stdint.h> +#include <stdlib.h> + +void triInsertion(long* A, size_t n); + +void triFusion(long* A, size_t size); +void sousTriFusion(long* A, size_t first, size_t size); +void fusion(long* A, size_t first, size_t middle, size_t size); + +void triRapide(long* A, size_t n); +void sousTriRapide(long* A, size_t first, size_t size); +size_t partition(long* A, size_t first, size_t size); +void permuter(long* A,size_t i,size_t j); + +#endif //TRIS_H diff --git a/TP1/tris.o b/TP1/tris.o index 3ac31f9566182cf23d8866866ef876f00e45e93f..a60fc51aa905726e26b581fcbdde9c80d5f4adfe 100644 Binary files a/TP1/tris.o and b/TP1/tris.o differ diff --git a/TP1/utils.o b/TP1/utils.o index 25be2a52f64bb733f2762702c2b1b50f92231104..4ff1808805cf14b0b2307154829db41bcb7d719c 100644 Binary files a/TP1/utils.o and b/TP1/utils.o differ diff --git a/main.c b/main.c deleted file mode 100644 index 60765850e8a1f0398515296cbfba8c876b639153..0000000000000000000000000000000000000000 --- a/main.c +++ /dev/null @@ -1,6 +0,0 @@ -#include <stdio.h> - -int main( int argc, const char* argv[] ) -{ - -}