From f79c8e0647c8307a7f86a85adf4a1e41ea185909 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Fri, 12 Jan 2024 19:36:10 +0100 Subject: [PATCH] dernier affichage --- SAE2 | Bin 36312 -> 36376 bytes includes/charge.h | 1 + obj/structures.o | Bin 8760 -> 9168 bytes srcs/structures.c | 9 +++++++++ 4 files changed, 10 insertions(+) diff --git a/SAE2 b/SAE2 index 8779e813db2667de3e809ec703280ca44751262a..c31a8c86c9dafb11d19e479bee5119e28e260997 100755 GIT binary patch delta 3603 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 diff --git a/includes/charge.h b/includes/charge.h index 4c8c7fd..19d38bb 100644 --- a/includes/charge.h +++ b/includes/charge.h @@ -40,6 +40,7 @@ void displayListeDevis(ListeDevis l); void afficherDevisEntreprise(Offre **tabTravaux); void displayPrecedences(Precedence *tabP, int tlog); void afficherTaches(Tache **tachesTriees, int p_tmax); +void afficherTachesTriees(Tache *tachesTriees[], int p_tmax); void enfiler(ListeAttente *file, Tache *tache); Offre *newOffre(char *travauxName); Booleen emptyListe(ListeDevis l); diff --git a/obj/structures.o b/obj/structures.o index aaf79bbeda03d607cdf22c4ed8cb8a2779cd9540..da3e5a8b58e7d2aca201ba31948c196db69fba9e 100644 GIT binary patch delta 2284 zcmZ9Ne@L8l9LK+Rx_Ni$d2^nRnm-;>nZ}fbmTvUOId9Wvo@L9zjalBj+Z483dWMpr zP=os;Y4Y`tEevcq&|y$1p$o~-XhniFi$w$y(QcuzVuS=^y+6y{ zKHum2e4l&f{cH7?d}*F^VYS;fMNj(Z@fz=B%A=?qhcT}Z?~h)qNQ)<)Oi%@bsiS|^ zDs|2^wtm4k&P%C&0sC!)!<!2x{yqa@A zYz;GP%JW{$Y=nhiN5NBI9nNi4Y-<2%Y-LjDkEsJXBVHv2MQ#8h`>>_6yU|8M(zoOx=vRfJ2K@;arIE27D4U8)q2f#+^ zGf9YNz$i%G06q))!6s>Fnvkw)Br|OOb3RC6POBt zF$5fnhK^q0yXA1!%^@Ge4U4x$9Jq0I{BNv^^6<}6RE3NE3-(`;qx=f{=j^|+zsJ7C zPIFB4+scPTBL^OGK{?Zq39>5#yW$YvDG-q^yQTAJW{@3g??6)i*65=8U z?r^~??0>V@vj59o#GaL^2AITN#NNyUc#6G{{V@AKT>m^dt}njjz>8dPmHj35H`&j! zx3CYfSFw+?XS3g6e}KnJGx7`jQ6A7kI9*?4aiES?4B94l@G|?C?A`2_*$3HQXP;o- z%l*aI&>xgXEdCK}#DG$|1jxt~d= z3Qq&nO*^f4v|P^LS1JbB_k+|{uu(m}p;r5p^X;6kkSB8UZGXuD>_hSj_A$ADeX0C8 zH~+NcYF(Wy*4fAK(o_3@J%)cpYWJ{l$CiHu`M>|PBcEiGC-cf>b)F|}V@IjiCa>q^ z6>RJ{BeuhD$h&zTr3J08eYmG3h!1*iOHWsLHk$u~&0g`eJYG<2uc(yW1>gJ!)fg?% delta 2048 zcmZ9NZD?Cn7{{NqnQL8N?8|zSm^Mj^VznKUuCUFXnyu-UW>+0UVbcZT8=D~Piy!u( zk}3oHp@Wvwfui8VOs5V}Qdq%l20ztOw9KMKQ34Luj)DvnIu!K(C6Q>j#6( z=~|;0^RK%rG-dE0@+EKtoCS640;pr3cg(&6>ez3B_oDx_qnQLVHtTs|UFj<@Fq;N- zC9Re0S8 zVc0yrIGREY#edFFBeN zID&YT`4EU*=eIhV*`Vt;6BPShsOgx#^>u7C;O4Ak|Hf;b5N zX-AU-GuDK?T5YvnrR&Xxz5G7dNti}+8U>GocoqIpM>7BpBfbmN_3Z@l;QSs(Q^xt* zkGP&g?Y{)#f%=P%W(L&$mq6`*5yYeO3jw@PRLo%ndhwTHgCuwt8Vop^I*r@*h@1Qz z&Kh18Ob0y!!U>oH_ zR2s0djn75B=HU^3SIVfXchQUV9{L15LqA1-ihhKibDo!e22QX+i2ecnPfSj4_&I$i zC-e)wn*ImD{jv6qg{=~noG!Vcx@!N#m>iebe==( o|Ka&f{^(B_}4=)(%EC2ui diff --git a/srcs/structures.c b/srcs/structures.c index f9da3bb..f5a2dcd 100644 --- a/srcs/structures.c +++ b/srcs/structures.c @@ -346,6 +346,15 @@ void displayPrecedences(Precedence *tabP, int tlog) printf("\t%s\t\t : \t%s\n", tabP[i].travauxPrec, tabP[i].travauxSucc); } +void afficherTachesTriees(Tache *tachesTriees[], int p_tmax) +{ + int j; + + printf("Affichage par ordre d'exécution :\n"); + for (j = 0; j < p_tmax; j++) + printf("Tâche %s : Date de début au plus tôt = %d\n", tachesTriees[j]->tache, tachesTriees[j]->dateDebut); +} + // Partie 4 (à trier)