From 1d3b3b2945fd284ff0b17cb4c5cfc948ba4f1ca9 Mon Sep 17 00:00:00 2001 From: "louis.germain" Date: Mon, 18 Dec 2023 16:23:30 +0100 Subject: [PATCH] debut etape 2 --- includes/charge.h | 1 + includes/structures.h | 19 ++++++++++++++++++- srcs/exe | Bin 18152 -> 0 bytes srcs/structures.c | 7 ++++++- 4 files changed, 25 insertions(+), 2 deletions(-) delete mode 100755 srcs/exe diff --git a/includes/charge.h b/includes/charge.h index c26aab4..3520fde 100644 --- a/includes/charge.h +++ b/includes/charge.h @@ -1,4 +1,5 @@ #include #include +#include char *readAdress(FILE *flot); \ No newline at end of file diff --git a/includes/structures.h b/includes/structures.h index af91c56..f9653a0 100644 --- a/includes/structures.h +++ b/includes/structures.h @@ -27,6 +27,22 @@ typedef enum { faux, vrai } Booleen; +typedef struct maillonSucc +{ + char tache[20]; + struct maillonSucc *nxt; +} MaillonSucc, *Liste; + +typedef struct +{ +char tache[20] ; // nom de la tâche ex : Plomberie +int duree ; // durée de la tâche +int nbPred ; // nombre de prédécesseurs de la tâche +Liste succ ; // liste des successeurs de la tâche +int dateDebut ; // date de début au plutôt de la tâche +bool traite ; // booléen : la tâche est-elle traitée +}Tache ; + //Devis void displayDevis(Devis d); @@ -47,4 +63,5 @@ void displayListeDevis(ListeDevis l); Offre newOffre(char *travauxName); Booleen emptyOffre(Offre o); void displayOffre(Offre o); -int rechTravaux(char travauxName[], Offre *tabTravaux[]); \ No newline at end of file +int rechTravaux(char travauxName[], Offre *tabTravaux[]); +void minTravaux(Offre *tabTravaux[]); \ No newline at end of file diff --git a/srcs/exe b/srcs/exe deleted file mode 100755 index afe736b24f903c9001b60bb9e6d4e3ce91b0f934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18152 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 Rr@#4gN`ju-I7travaux)==0) return mid; if (strcmp(travauxName, tabTravaux[mid]->travaux) < 0) @@ -141,4 +141,9 @@ int rechTravaux(char *travauxName, Offre *tabTravaux[]) deb=mid+1; } return -1; +} + +void minTravaux(Offre *tabTravaux[]) +{ + } \ No newline at end of file