diff --git a/Algos_1/a.out b/Algos_1/a.out index ff6643c3c1a68569c95521e4a8374e0627eaf525..69ac26e1ad5800fffe9f63ed47736f0d3501dd2e 100755 Binary files a/Algos_1/a.out and b/Algos_1/a.out differ diff --git a/Algos_1/algos.h b/Algos_1/algos.h index 5bbc17747aaf2f55cb59b1fc0abc5fa192ff324f..4ea67b136bc1c7712be2f2a4450e90b075ef3c3e 100644 --- a/Algos_1/algos.h +++ b/Algos_1/algos.h @@ -1,4 +1,12 @@ #include <stddef.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <fcntl.h> + void triInsertion(long* A, size_t n); void sousTriFusion(long * A, size_t p, size_t r); diff --git a/Algos_1/algos.o b/Algos_1/algos.o index 3cc998179e57f471a1117bd503656878702af708..bb617f334137bd27fc78dd604ea034953514c58a 100644 Binary files a/Algos_1/algos.o and b/Algos_1/algos.o differ diff --git a/Algos_1/main.c b/Algos_1/main.c index 0e48bd11954f41a4c60164669d6ae93661e9b155..bd63d11133a5f3eebcf08e8ea51c49e3ec2b5099 100644 --- a/Algos_1/main.c +++ b/Algos_1/main.c @@ -1,8 +1,40 @@ #include "algos.h" -#include <stdio.h> -#include <string.h> - +void readToTab(long* tab, char* file){ + int fd = open(file, O_RDONLY); + int i =0; + long tmp[2]; + int nb = read(fd, tmp, sizeof(long)*2); + while(nb == 2){ + tab[i] = tmp[0]; + nb = read(fd,tmp,sizeof(long)*2); + i++; +} +} int main(int argc, char **argv){ + if(argc!=3){ + printf("Usage: ./tri <option> <input.txt>\n"); + exit(1); + } + + long* tab = malloc(sizeof(long)*100); + readToTab(tab, argv[2]); + for(int i = 0; i<100; i++){ + printf("%ld - ", tab[i]); + } + + if((strcmp(argv[1], "--insertion") == 0)){ + + } + else if((strcmp(argv[1], "--fusion")== 0)){ + + } + else if((strcmp(argv[1], "--rapide")== 0)){ + + } + else{ + printf("Usage: ./tri <option> <input.txt>\n"); + } + free(tab); return 0; } \ No newline at end of file diff --git a/Algos_1/test.txt b/Algos_1/test.txt new file mode 100644 index 0000000000000000000000000000000000000000..a968cd1a2d480b6f8fc2fc490f7ffa9502100bac --- /dev/null +++ b/Algos_1/test.txt @@ -0,0 +1 @@ +3 4 5 6 1 2 9 \ No newline at end of file