From 57d63ef69a27ac460236abbeb8e61808ff6cbde7 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Fri, 12 Jan 2024 17:02:06 +0100 Subject: [PATCH] les .h --- SAE2 | Bin 35944 -> 36008 bytes includes/charge.h | 19 ++++++++++++++----- obj/structures.o | Bin 7728 -> 7960 bytes srcs/structures.c | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/SAE2 b/SAE2 index fce579eeb967b058dd9c1ca01cad29a7d248ccf5..c6063630bc76a283d08c7ddc43db88e1ea67c472 100755 GIT binary patch delta 2009 zcmZXV4^We39LIm}AJ`^}(=4YkHi85N1i^t)!cfre%)}tW)4(}jbOA%gP&lnkMHxaK z>#+be!ScGM2$3X=(=Z;A&ZQ}rKR&izo1M_m{P1F6^I>B!splLs;&C878fRivVigA#i?{%h zm9+qkj60qGR7I?6C7U86Pt@UB$1G>O4E8~Qy>}V59uB-7PVc=f(|f<-?7i{ik~(g@ zT6BQDcVugqi-bg}Yn!ZEMK64h?% zoF1R{EYVt5q;#*D98So;2)qA(hE4HyWXp1=eJR8WxRKIEmp? zi!j`n;hQZ(*la3;@7ZOBiq}etGtE|uu*rhM!jI^!Uy0tQZ;Bnr-W?Nd!>qKl5jM*r z7-0vOV=!(M%AlI#;NTJfPB23sTVhxbbzGTsYyrnG^tlB`xUv|hG@0QNR{`Ck--v90 zpE#4*m(nei`{$$gS_&hr>n~KQ#KgyTCLEq{(gLb^4qTb23tOO$FDYJU5pYH8;Sf*K zc23Pa%^NrR20eq;n`L4OCHU~Xf~zzb1-QYR7MGWqO3Y&;OS5_SlJd=hWh^PUM-J@F zjs21>0ykF-cR4eB!sA;x$6GD%fX8!&rGLIQM_bPvXXee-)-m-&T{VYfRXGycL!~RH z4m}g`BYH%+k+PifVagF2GHzF%tpYCybVCF_#BLcHiDM}DP@YHmRG1WBLRs~K#A_%k zqb1%z`6*=!<;EB(zD;5q%!`u*2Q?fFm)J=;X1>G?lyhkOpwB-?in}Q1(u7V@_FctY zlzAHeZj1{7Tr`8L)Nm26Q2Yt^D7)e%9-@4cF33x{5$|u&AB-QIxPxmWBo0AF6hmWW zHo3i9V_52^uJYr2Ki=TS#eQt{@;-66z zIZ>U=B)MO7OlGE-tpC3g+=(?GFr;TsQedr8%ffh)&d;!^<WAy5g-zC8tA2N7!JzF}p0!OE`}Z67&&@jAS$pN@ru_w6RE=`v*EIW( zag8ia(eki6$k3S=yL_*#IfaZX3>S~)_U{So zdyfw+R9Y{-_0H0;M7^rTthrECbenY5+9NOD-TzyDb5QCnSLyS@`|=4l_|`v$BfED0 Oa5h$987!yY9Q+F$UjPpP delta 1807 zcmZ9M4NOy46vxl|0PIAqb1GylZ9zdk6qOZlqR;?-L`5c;I3#YhJVz60u`LKr*CMEV zxlwN&bs<4Fmw`@Y){Nnt;5H}Gs7Q?a5EqI|)@&mz8<169*lFKwGJEsxd-wN0=iYPf z$GaUTSdWu!8FVO|^9!R2t(Z62*4O%}}x5ucS;7BXJ`s!M5cFIiVgp2CM33WlC+8z{fX;bd@{?NcRfn{ehzDqlg~4k&-QJ%k^yEo1UEAjm{ONF zGeyIW^JGblK~Z9R4d)mO|~$LX);qTTum5j9D;Qpn>J!QZ_m|a{|NV2$gy>oMSg>tMZIxxdw|#C^zZN z0$e2R2j$iuSuxtrY`#g*!DF^it1A`E;K7mF)&g*X0lHbEwgg65v&A3$J&uD&^DffA+v9mMtlvg!z{Hr0j}`+H5F#P(coW3G1@iW zSWzjM{F8$3$mQB?3CG#p;NZ&OTh0J=JTCMp-eQ7VJRTjuT$P2&^jDP4Obh-{nRUw; zAjZ0e<vWMPP zA5ae5U7eI2)b66(K_}4bXDdKI-Z|KY+X08ABL75rh$iHw>`W8wla$|FATp2lA4>R$ zWnK`+2XTsz$;9E8t!slUn}c|35ElorE{OF(yeEjOpJ!q{GJ9d;^BNorV&5$uPuxdR zX82lhSQiBp*S7jujLX_!XYeRWnpTB24k%d&CmKH1Dyu>-UttO~xyxb0Cx_1Jv)%Rm zEsxs6{$9Mqk-czZjr!?>#eej4-aB=m;mNd;efKXPl@^hQHIw_#7Jd2W){&d*W?&$8S!p6EcymhU==W20M&6NZ90rQPfhya^~cUft{YOfj}H>2*%sHdzcn>CFM8?rg0QB}zIU#t-MroTLU+~~ PS;wTT^X=8Q#f;%UEPAzS diff --git a/includes/charge.h b/includes/charge.h index 0c604d1..8cf2fcf 100644 --- a/includes/charge.h +++ b/includes/charge.h @@ -14,8 +14,8 @@ Precedence *loadPrec(int *tmax, int *tlog); // Recherches et tri -int rechTravaux(char *travauxName, Offre **tabTravaux); -void minTravaux(Offre **tabTravaux); +int rechTravaux(char *travauxName, Offre **tabTravaux); +void minTravaux(Offre **tabTravaux); void freeListeDevis(ListeDevis *ldevis); void fusionDevisElements(ListeDevis *R, int *tlogR, ListeDevis *S, int *tlogS, ListeDevis *mergedList, ListeDevis *last, int *k); void gestionElementsRestants(ListeDevis *mergedList, ListeDevis *last, ListeDevis *source, int *tlogSource, int *k); @@ -25,21 +25,30 @@ void triFusionListeDevis(ListeDevis *ldevis, int tlog); // Fonctions de base -> Qui étaient bien dans structures.h... +int max(int a, int b); int lenListeDevis(ListeDevis l); +int longueurMaxNomEntreprise(ListeDevis ldevis); int nombrePred(char travaux[], Precedence prec[], int tlog); void displayDevis(Devis d); void displayOffre(Offre *o); void displayListeDevis(ListeDevis l); +void afficherDevisEntreprise(Offre **tabTravaux); +void displayPrecedences(Precedence *tabP, int tlog); +void enfiler(ListeAttente **file, Tache *tache); +void initialiserFileAttente(Tache **tabTache, int nbTaches, ListeAttente **fileAttente); Offre *newOffre(char *travauxName); Booleen emptyListe(ListeDevis l); Booleen emptyOffre(Offre *o); +Booleen estVide(ListeAttente *file); Liste newListe(void); Liste insertSucc(Liste l, char travaux[]); Liste lstSucc(char travaux[], Precedence prec[], int tlog); ListeDevis del(ListeDevis l); ListeDevis insert(ListeDevis l, Devis d); ListeDevis newListeDevis(void); -int longueurMaxNomEntreprise(ListeDevis ldevis); -void afficherDevisEntreprise(Offre **tabTravaux); -void displayPrecedences(Precedence *tabP, int tlog); +Tache *defiler(ListeAttente **file); +Tache *trouverTache(Tache **tabTache, int nbTaches, char *nom); + + +void traiterTaches(Tache **tabTache, int p_tmax); \ No newline at end of file diff --git a/obj/structures.o b/obj/structures.o index b014679eb57a5bf1dc4b22bab28e3bfd1c3f5950..7ba73d792af463f143823e92f2957598f2a94cfc 100644 GIT binary patch delta 2499 zcmYk7QAk@?7{||z(Il(WMAIZ{>OyB{JCwN@rgk2CHExvdK;e2BX;_8_$b9TsG@C`_5KFdXmfZaZ-K-QV|p z=bYS=bMIMb|FR=zR+s@{w=F}{3{1SyakOyczo-khkxC(MOw2Y1oWv+a(ee}b&m0>p z)3U?CR=*HM2$^9a!q%%s^Qi;ebtBRm6@sd0_#WL!#6Y@GB3i7kjGwF@|Gv7rvdYo^y#7iqCyAaB$x|Dm9b5piOyxP*Xjk77+w%Af+u5O?8d_}FVo&Vo?nl%eK zBSd2!JSK!%)s#aV9|ZBgskb#{ADBRWFIahcgYxdWH^Z+q1f__m=83a2JKky0h z0=NTG-8P8brnWS*auqiw5>sFoI0@23V<1hG(d-`uX@E2s!T=+hG6m9#Tn3LKKBOso zL0X9(&Hg%&9`rB#Cse-=21Qn=f_)?8I#`FqDo7J8gLw7SlBS#ispD<10`VzLnE|PO z6vPXy(wZ_3QhgJMmr^xo$~9~sT2TcyW^qM1u#H{z5_}7!j+-;KGy6sMX|8wvQreVd*wA#M)BM7R4&}JI@hVXJ3>Ud`l;zo-gYG1| zb0WRW?wmpi9?v-X9FxZXL9k8?g=9MdCw%>n29rIn)zMoO%%>gPHyaGI;d=j>~Eb*a6@?i|?P zAcoMtEooBE39Cg0LJQ7?K{tgLeSYurd#fM3e4g*`_j~@l z&-;7c=SKH@*F?5%qSi#V5qM72PM+`H*T3gKZyC+OI%CErKRuR;10&+aIwpTV*|N6R zizRi=))-Tc>)L)}_J_|0$Btwgj5&>Gu*sMevSj#P-^rw*JS3ar;mu$*{3~esFp*eT zEuRX)wL~&ZmCuAnchxN9E4uasnXsp}A-PJjSf{8m6NCp+2a{=ihw&(7E`Fm(b?MsX z!=BWkU?coB)mSNO#74sak?zNbRU{k;+y2*pR5Q#mexfr>rrVgK9k9h1*Y0W8NfQ4WY{tLp zX;*~Y^2|~ryYY9{~&w<_Cm>Xkn(Uj&w_2Iagsn4?12d= z6K%71GEvEM;69WAwjjmhHa+bZv;2kLOFCk~uEqdC1_4mOl z{JpS1!=`CSkrX*1!Wrd+auhy|e?;}`%Dl22K1;k6%1)#qb?llwZ34=IE9Kw|Lm^I;DC1981pEBEhq__kll6nJnfwNXCa&Bik@~%{Z}9_=|(+mKa`#8 zgYtq|C<~ylqwzbL%<%HA!_!hIQGm~4Sd-)Jgf`4I%olEvS&fSAEgIGM;@|X5iSt}! z^Tpm){hI2RRgb9dR{gH(!>X^VPN@FK>w@`>$z_6dP54grFRE{=u9D?rU+Dm~s;5<- zQ9Z2syy|nRFRJcT{YIquR{Z><1zgsIzjeZ^s()5Jty&607F<;QiR#Z(&+B+!tNuXs zUDdCu-WJXL<^^?B>m~S@>L*q2RsEuBsbE>awCcO6Z>j!5^|z|u)Bf=%&5Nd@HOx9 zc334K_70B>5MQ}3X