From 65181e1871d24693ea522d921d593bf0f6f427e2 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Fri, 12 Jan 2024 15:30:08 +0100 Subject: [PATCH] enfiler --- SAE2 | Bin 35720 -> 35848 bytes obj/charge.o | Bin 5248 -> 5384 bytes obj/structures.o | Bin 6816 -> 7368 bytes srcs/structures.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/SAE2 b/SAE2 index 179b247a1ba1d5721df6143d147e3832b3129272..92ce268012f73393ef0a92c2ba15fb47bc2b0745 100755 GIT binary patch delta 3862 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 IQX+=`0T);x5&!@I delta 3268 zcmbW4dr(tX8oKmGgs zi`UOY-N2)KoAx6LluL$ssxzsIfyFYPs>s8K06LhvNKqE$UaNS*LdSQ1*fY+9K)PO- zX%H$gQXLo93o8sl`7}5NN@u^F`avGNgS^T6V7kfsG4Jdz$Dx>{X}wTu5EhFbG(2h$ zaMkTMiI$L~_B< zQq~M)3kPvXZ)CS|e$qVdF^~C4G3*9zOww`R@wh)}5xa?fNov&vUdr@c97-~%dWc+n z<>-ev->@ojpGYm0qo*e(j=T7nQ5Rn^dXlsYai2lW_Tovy8nzps8gyL7I7TIBuoYOE zJdcjSnyd~kCTDuc!^KBn8NQL6nO4khjqg^_qr(JOi<%;-rPCS95#q?$x3`*Hft-3{ zM{)!sjwi=!vq>ZFWHj~NluH0}oG6LdajmbSTa7-Aj5ViWyGmqv)2r znrh^r0Ntsp*(v1GRQC+htsyQMEo)B3ESX)n7*E|1DJ1I$gZQ+ zn99!L31coB#(rZvOLkXeb}_cc{c~0UV_#u@&L3H#`(e&u#_nQW-g4G}f5|h34vvYJ zN==ula`Zu%>3pBto3~q`OmL_Y9IqFIyIU89GNbe@h^DI{mdU;N8E|RCeD{AgikeTSt!-3V*bS|Z4U==kTrPN$2p=RtQ z0L2o^4yyy^lvo{&7HJ&4X3G}41!C9QEmf9ki>=Dy04;EqT9{>ZG}M}#z(AK}u^44B z&EfNe&63kr9xiMp4Sv0EZu34?YPQza*4w1G2N`g7i)GSGd$v2Q^)_f{l-eug)m=u- zktNhPi&@$Bsw%iaKGw!{=FRKu<{jqkyWlhCu-F^nHo1%}Bg28^{uHE1MrqDntLy8Q z+8UefmIk}kVS#Zne!N~Z-bjt-S7KA~eCek+DfJ#sTrj-Htut5E(30I8t#T!8pv4CJ zxq5RooZ}pgzO23^)mL^3bFGSIH(PD+Z_aA-r}z_TokhSm!$=X6vO=B*SCKzc=-{O( zPm|cQg2a}c@F%{$ZnND&IaI?1lAkIU6E=(StC!j9>y}w-EpVH!s_{?r1sNS_B%>?! zqEVFvyu5XpZ%3sqp6)x@pLyKVk{-0qQrFPf1hre>48v<}bJH&~N_&vi!q;3KOmH^n z-n%vAI>?j*x$PPq=ITgd)2pi@byZKJ;Hao`mGF*5ds#&3v zE^#V(h0sIZ87Fb3%mWD$(}nTrJG2s)%UmKe?Wa#amMH0W${ZdmvG}V+j9()2?<8)9 z3-VLcB^#vC%wz|DmU$#w;wv%_WJ&x$=5G37B-%ff*(pyTexk(*gX9G%X)JPMyksBl z<7R*XS)i8<9vdWsOqmCgB`%b?CPm_3_?fnjhEOhZxV&Q(GH=S0^wlz7qo0MMeS^r& z)Qo5(!Ea>)r_6_BcFBw~*DR3iyJS9`tmHrn@jp@7UtjW3%MNp>d^7`-|t(z`qKT%SsQC!aNxdnjcKg*hvGoJyC;3k z{Rr)rKRkVOspZ=t%lEeSm}tXK=ChZ_X5348sNMN&Y~$V34UW$~c{i;4JL6tk%MX8d zq`R)_bI{!G)HR&`)UyBBqf7f={&i}$x$6_Q=*H!Qf4=9*y%@Y>gLb|Ap9=gJR(V-r diff --git a/obj/charge.o b/obj/charge.o index e820d598d92ce92087995874ae309974efcd2492..482e0c53490ecc934b5cf4fc630bc2944ad492c1 100644 GIT binary patch delta 1857 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 F{{aWzX=wle delta 2238 zcmZ9NPiS0K6o>Ci$8^#(e@&X1bZVyw$P^PznlvVw8!J?)@D|Yy5+SKYQfgrq6(dB6 zyeb6?MofGIX3@onDMT1-%0!5e#VB34h!7!2k)T;*QAI&$7A^w%op;Zu zz3<(7?t9-26;98cX)f29sNM4%%XRZFjkIQJ{&TDNyU<|Fd-J#Ynk#{6ai!JH|2A^0 zQ0qim-Dw6rfK_?Nea5AQT4;?*valf0_y)#0J0M`~u`&Mb-<#8|5#W4aAIW{kf_6xu~7egUTN zZ#voqXz}y#DE^$I&B0#$EIegQZq#w&EPN7w7|M8qu$_MWj)9Hyr-Q)n2VKH_m?UAx z(XPR#iC=>Qa2ob8!Ia~~B$R1Y7YJ9c>=UO3XPgEYC>^(9GyayNU4xRp3aLVW#nDbd$-fF4@pFzg15e8MR8b&H zyUL$#ek)KqEJKcrUv#uSlsqXriN|0)apPzgs7+b9t5D)O$QklqceIDqkHf?GF-N;u zWrC7Rn^uAgwU ze{uvL#oys*MG4!GZSl7pZBhL2kCwJ^>3$8xn)x%1b_~k;WT8CI85q?%lzcqHqxwCL zmfeqh7T<6OK93@_;dJW_ZzlAPv;~z{T{|aRi9V=fN>@N zg6bbtUsCP6Kzoes=xH3Ci8Qa!5^Y^%Pax`mCE_Ppv2)t#ybR9CBhR`sts{tK#Q z%j>JCgO}B~tqGS^f1-Ly^;@dnR{g$C@S*BgRe!E}San%-QuWWO_hh^P^KUhN(Fr>B zyY#K<%c^gwen<5U)uHNFbb`v34v40FD&M)EShWWFT&E(XeZduoQTZBmVu&82BBk+O zk90yiv=Ec{y2fAAc;(A-S9Kmri&yfUly^teUusa=6_2m03|RR%p2rlu%biPmz!lvP zPa*B14w&Z!ByA(~lE+`{P&XZUl)384r}I;Mtbf}O;{W>Heeo~DHX>v8}9 diff --git a/srcs/structures.c b/srcs/structures.c index 6427098..5153e2c 100644 --- a/srcs/structures.c +++ b/srcs/structures.c @@ -43,6 +43,12 @@ Booleen emptyOffre(Offre *o) return emptyListe(o->ldevis); } +// file +Booleen estVide(ListeAttente *file) +{ + return (file == NULL); +} + /*-------------insertions---------------*/ // Insere un devis en tete de la liste des devis @@ -62,7 +68,6 @@ ListeDevis insert(ListeDevis l, Devis d) } // Insere en queue de liste (les successeurs) - Liste insertSucc(Liste l, char travaux[]) { trace("insertSucc"); @@ -79,6 +84,27 @@ Liste insertSucc(Liste l, char travaux[]) return l; } +//file +void enfiler(ListeAttente **file, Tache *tache) +{ + ListeAttente *nouveauMaillon; + ListeAttente *courant; + + nouveauMaillon = malloc(sizeof(ListeAttente)); + nouveauMaillon->tac = tache; + nouveauMaillon->nxt = NULL; + if (*file == NULL) + *file = nouveauMaillon; + else + { + courant = *file; + while (courant->nxt != NULL) + courant = courant->nxt; + courant->nxt = nouveauMaillon; + } +} + + /*------------suppressions-------------*/ // Supprime le premier maillon de la liste de devis @@ -109,7 +135,22 @@ ListeDevis del(ListeDevis l) return l; } +//file +Tache* defiler(ListeAttente **file) +{ + ListeAttente *premierMaillon; + Tache *tache; + if (*file == NULL) + return NULL; + + premierMaillon = *file; + tache = premierMaillon->tac; + *file = premierMaillon->nxt; + free(premierMaillon); + + return tache; +} /*---------------calculs----------------*/