WIP:En fait presque

Algos_1/main.c

@@ -8,14 +8,13 @@ int main(int argc, char **argv){
         printf("Usage: ./tri <option> <input.txt> d \n");
         exit(1);
     }
-
-    long *tab = malloc(sizeof(long)*TAB_SIZE);
     struct data data;
     initData(&data);
     
 
     if((strcmp(argv[1], "--insertion") == 0) || strcmp(argv[1], "-i")== 0){
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
 
         printf("n:%d\n", n);
         printf("Base      : ");
@@ -26,12 +25,14 @@ int main(int argc, char **argv){
         triInsertion(tab, n);
         printf("Insertion : ");
         for(int i  = 0; i<n; i++){
-            //  printf("i:%d cont:%ld\n", i, tab[i]);
+            printf("i:%d cont:%ld\n", i, tab[i]);
         }
         printf("\n");
+        free(tab);
     }
     else if(strcmp(argv[1], "--fusion")== 0 || strcmp(argv[1], "-f")== 0){
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -43,9 +44,11 @@ int main(int argc, char **argv){
             printf("%ld,", tab[i]);
         }
         printf("\n");
+        free(tab);
     }
     else if((strcmp(argv[1], "--rapide")== 0) || strcmp(argv[1], "-r")== 0){
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -57,10 +60,12 @@ int main(int argc, char **argv){
             printf("%ld,", tab[i]);
         }
         printf("\n");
+        free(tab);
     }
     else if (strcmp(argv[1], "-a") == 0)
     {
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -85,6 +90,7 @@ int main(int argc, char **argv){
             printf("%ld,", tab[i]);
         }
         printf("\n");
+        free(tab);
     }
     else if (strcmp(argv[1], "-g") == 0)
     {
@@ -104,8 +110,8 @@ int main(int argc, char **argv){
        // free(tab);
     } 
     else if((strcmp(argv[1], "--insertion-verbose") == 0) || strcmp(argv[1], "-iv")== 0){
-        
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -121,10 +127,11 @@ int main(int argc, char **argv){
         }
         printf("\n");
         printData(data);
+        free(tab);
     }
      else if((strcmp(argv[1], "--fusion-verbose") == 0) || strcmp(argv[1], "-fv")== 0){
-        
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -140,10 +147,12 @@ int main(int argc, char **argv){
         }
         printf("\n");
         printData(data);
+        free(tab);
+
     }
      else if((strcmp(argv[1], "--rapide-verbose") == 0) || strcmp(argv[1], "-rv")== 0){
-        
-        int n = readToTab(tab, argv[2]);
+        int n= 0;
+        long *tab = readToTab(argv[2], &n);
         printf("Base      : ");
         for(int i  = 0; i<n; i++){
             printf("%ld,", tab[i]);
@@ -159,10 +168,11 @@ int main(int argc, char **argv){
         }
         printf("\n");
         printData(data);
+        free(tab);
+
     }
     else{
         printf("Usage: ./tri <option> <input.txt> f\n");
     }
-    free(tab);
     return 0;
 }
\ No newline at end of file

Algos_1/utils.c

 #include "utils.h"
 
-int readToTab(long* tab, char* file){
+long* readToTab(char* file, int *sizze){
     
     int fd = open(file, O_RDONLY);
     if(fd == -1){
@@ -21,10 +21,16 @@ int readToTab(long* tab, char* file){
     int size_tab = 0;
     while(temp != '.'){
         if(temp == ' '){
-            testn++;
+            size_tab++;
         }
         read(fd,&temp,sizeof(char));
     }
+    *sizze = size_tab;
+    
+    lseek(fd, 0, SEEK_SET);
+    long *tab = malloc(sizeof(long)*size_tab);
+
+    read(fd,&temp,sizeof(char));
     while(temp != '.'){
         
         // printf("n:%d  j:%d  nb_size:%d\n", n,j,nb_size);
@@ -44,19 +50,13 @@ int readToTab(long* tab, char* file){
         }
         
         read(fd,&temp,sizeof(char));
-        if(n==TAB_SIZE*(nb_size_tab*10)){
-            nb_size_tab+=1;
-            //printf("size:%d nb_size:%d, sizef:%d\n", sizet, nb_size,  sizeof(char)*(sizet*nb_size));
-            tab = realloc(tab, sizeof(*tab)*2);
-        }
-        if(n==sizet*nb_size){
-            nb_size+=1;
-            //printf("size:%d nb_size:%d, sizef:%d\n", sizet, nb_size,  sizeof(char)*(sizet*nb_size));
-            tmp = realloc(tmp, sizeof(char)*(sizet*nb_size));
-        }
+        
+    }
+    for(int i  = 0; i<n; i++){
+         printf("i:%ld\n",tab[i]);
     }
     free(tmp);
-    return n;
+    return tab;
 }
 
 void initData(struct data* d){

Algos_1/utils.h

@@ -22,7 +22,7 @@ struct data {
     unsigned int ct_parse;
 };
 
-int readToTab(long* tab, char* file);
+long* readToTab(char* file, int *sizze);
 void initData(struct data* d);
 long* generate_tab(size_t max, size_t length);
 void printData(struct data d);