diff --git a/SAE2 b/SAE2 index b727579..1aa55b7 100755 Binary files a/SAE2 and b/SAE2 differ diff --git a/files/precedences.txt b/files/precedences.txt index 77ca830..f3c3b0e 100644 --- a/files/precedences.txt +++ b/files/precedences.txt @@ -3,7 +3,7 @@ Structure Electricite Structure Plomberie Plomberie Murs Electricite Menuiserie -Plomberies Sols +Plomberie Sols Murs Peinture Peinture Finitions -Sols Finitions +Sols Finitions \ No newline at end of file diff --git a/obj/charge.o b/obj/charge.o index 51667e9..821b33e 100644 Binary files a/obj/charge.o and b/obj/charge.o differ diff --git a/srcs/charge.c b/srcs/charge.c index 91aca6b..64da314 100644 --- a/srcs/charge.c +++ b/srcs/charge.c @@ -106,9 +106,6 @@ Offre **loadOffre(void) return (tabTravaux); } -//--------------------------------------------------------------------------- - - /*--------------precedences--------------*/ @@ -120,6 +117,7 @@ Precedence *loadPrec(int *tmax, int *tlog) Precedence *tabP, *s; char *precSuccStr; int index; + prec=fopen("files/precedences.txt", "r"); (*tmax)=5; (*tlog)=0; @@ -134,12 +132,10 @@ Precedence *loadPrec(int *tmax, int *tlog) printf("\033[0;31mErreur: \033[0mmalloc loadPrec\n"); exit(1); } - precSuccStr = readFromFile(prec); while(!feof(prec)) { index=0; - printf("%s\n", precSuccStr); if((*tlog)==(*tmax)) { (*tmax)+=5; @@ -153,23 +149,19 @@ Precedence *loadPrec(int *tmax, int *tlog) } while (precSuccStr[index] != '\t') index++; - strcpy(tabP[*tlog].travauxSucc, precSuccStr+index+1); precSuccStr[index]='\0'; strcpy(tabP[*tlog].travauxPrec, precSuccStr); - - printf("HI\n"); precSuccStr = readFromFile(prec); - (*tlog)++; - printf("HELLO\n"); } - printf("HI\n"); free(precSuccStr); fclose(prec); return tabP; } +//--------------------------------------------------------------------------- + // Chargement des tâches depuis un fichier pour chaque offre Tache **loadTaches(Offre *tabTravaux[]) {