diff --git a/includes/charge.h b/includes/charge.h index 30d51b6..bc94ec0 100644 --- a/includes/charge.h +++ b/includes/charge.h @@ -7,4 +7,4 @@ char *readAdress(FILE *flot); Tache **chargeTaches(Offre *tabTravaux[]); Precedence *loadPrec(int *tmax); int nombrePred(char travaux[], Precedence prec[], int tlog); -Liste lstSucc(char travaux[], Precedence prec[], int tlog) \ No newline at end of file +Liste lstSucc(char travaux[], Precedence prec[], int tlog); \ No newline at end of file diff --git a/includes/structures.h b/includes/structures.h index 07ec7b0..082ff6f 100644 --- a/includes/structures.h +++ b/includes/structures.h @@ -1,6 +1,7 @@ #include #include #include +#include typedef struct { @@ -35,12 +36,12 @@ typedef struct maillonSucc typedef struct { -char tache[20]; -int duree; -int nbPred; -Liste succ; -int dateDebut; -bool traite; + char tache[20]; + int duree; + int nbPred; + Liste succ; + int dateDebut; + bool traite; } Tache; typedef struct @@ -59,7 +60,7 @@ Devis readDevis(Offre *tabTravaux[]); ListeDevis newListeDevis(void); ListeDevis delete(ListeDevis l); ListeDevis insert(ListeDevis l, Devis d); -ListeDevis sortListeDevis(ListeDevis l); +ListeDevis sortListeDevis(ListeDevis l); Booleen emptyListe(ListeDevis l); int lenListeDevis(ListeDevis l); void displayListeDevis(ListeDevis l); @@ -71,3 +72,8 @@ Booleen emptyOffre(Offre o); void displayOffre(Offre o); int rechTravaux(char travauxName[], Offre *tabTravaux[]); void minTravaux(Offre *tabTravaux[]); + +//Liste successeurs + +Liste newListe(void); +Liste insertSucc(Liste l, char travaux[]); \ No newline at end of file diff --git a/srcs/charge.c b/srcs/charge.c index c3b24c9..7d121f5 100644 --- a/srcs/charge.c +++ b/srcs/charge.c @@ -97,11 +97,14 @@ int nombrePred(char travaux[], Precedence prec[], int tlog) Liste lstSucc(char travaux[], Precedence prec[], int tlog) { - Liste succ; - MaillonSucc *ms; + Liste succ = newListe(); int i; for (i=0; ildevis; @@ -168,3 +168,20 @@ void minTravaux(Offre *tabTravaux[]) } +Liste newListe(void) +{ + return NULL; +} + +Liste insertSucc(Liste l, char travaux[]) +{ + MaillonSucc *ms; + ms = (MaillonSucc *)malloc(sizeof(MaillonSucc)); + if (ms == NULL) + { + printf("\033[0;31mErreur: \033[0mmalloc liste successeurs\n"); + } + ms->nxt=l->nxt; + l->nxt=ms; + strcpy(ms->tache, travaux); +} \ No newline at end of file