|
|
|
@ -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[])
|
|
|
|
|
{
|
|
|
|
|