From 5a0318b50f91a74fa738b29a6ea6c181679a7981 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Fri, 12 Jan 2024 17:27:39 +0100 Subject: [PATCH] part 4 ok, a test et faire un tri par date --- SAE2 | Bin 36008 -> 36200 bytes includes/charge.h | 1 + obj/charge.o | Bin 5488 -> 5672 bytes obj/main.o | Bin 992 -> 816 bytes obj/structures.o | Bin 7960 -> 9040 bytes srcs/charge.c | 2 ++ srcs/main.c | 2 -- srcs/part4.c | 2 ++ srcs/structures.c | 38 ++++++++++++++++++++++++++++++++++++-- 9 files changed, 41 insertions(+), 4 deletions(-) diff --git a/SAE2 b/SAE2 index c6063630bc76a283d08c7ddc43db88e1ea67c472..378a5f3a5164fb05eac96946a5211d9630fb58c5 100755 GIT binary patch delta 4610 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 delta 1594 zcmZ9MPe>F|9LIm-+UnM@j_caEV6CR2l-sUul2K!tfl&kHq3{sop@RntiL{_#3oW7) zR-Sb#szab1`hx}@5+ovwgzTo&VIzYmqYlv@Q0)8L_gjj6@c6vX@AsQ|Z|1$3(c15u zlg)+6wUlo2hGufOeRuJ@ynn$Q47*ICzTtcEKqm1`swaHIpPNE+K3zVoL8I%4JQ$a# z7Gt}ApGC9{cBP2ulc6pf8;yW^Y*edh!yKPC>O9eYdb4uQ7+YzjVbmqjnIqg&dGsd} z!<@--P{wn#YZss?fA^ zWiO=l5zt3`Yo zn6Yw)IHL4MnJ9`0OQ~V&?ZW_=k>tp04tGb1o4=W7+3?=2+KfT(9#;sZjf(S z0`kNb$P=63dQ6tH1$}@81npP=X@IG2jb3!D3u^RMTk&d4gJyC#VFu zt_%#Ku2j<@up04Y4-xj-{jKTz0I}!pcTMLL$WOiq1`tm%(H+&{FEyg7*WYHu)s+8W zVI8WvaPWAUonTyTD6oxs)ld-L!H;qlyI&6;0xQ56$SVzkJc9+|47#SKlfrIC)KGyP zieNAU!-;jDYdVwZ?385hz_7LMO-+Z7V?=$G>{%Gzt9x40=}KoeShf*S4OY0E-_I_@ zuxPhY(&eB$lmKQRw4;E4EJ$#;rRik}d_E`CP*lz6}RVez4~Cx{v)a7zlR z#BYlS#9xT7%7R{tFNuE?e-@M!0b-ekW0&^5cx&8lpmRQkYq%|-v(Liu6%sW`AoDl6E56K0v`)1U2&?&kW%Mau zQMj-jvH#|yhiaiHtU8LU_77Q^nJgd7@~2sTGRx=GOU&1i6@8+7!PfDf;DqrPwS&G8 diff --git a/obj/main.o b/obj/main.o index d468ba7ec34db2a476affa95a8b94c5cac0461b2..12067c4fdffab43a4a6f5e5ea783b23d734a8dbe 100644 GIT binary patch delta 304 zcmaFBzJYCmgU|{F2Q!GlopgWRlNx0Ph&Uv{vNm+7Zclr=9YL*p}n4Mcl)mkP6u7KXc zA=yuJBke#BFRUOC(O2!?OyV7)AL0Pc6`yAsllU&1;-@UmEfz1mylGX$_pU;ILm>yl zlb)hG@&uiEmB&$R$%LN&rI?OjU8HAMZ1tU4QBpn3{%$me zT|Cp=w?TG&k$8orB1C46f3V3&83|u!Nmk~npp_mV5l-KNG0+5Ma1ZPQx4qqq61ps@u16vooUb7T3U cV4NJU8HHj#o4+&)v~!s6lKe-=;`5090VbkiFaQ7m diff --git a/obj/structures.o b/obj/structures.o index 7ba73d792af463f143823e92f2957598f2a94cfc..f4730c0854c4500aa55369411f2582dd016e0a62 100644 GIT binary patch delta 3170 zcmZ9OZA=_R7{_N13U^289dA86;Cd)E&|VEKq}H}WuP^jbXoSYl}EOB7!8#F**_L}CtFlg88t2F3rg^Q=Xlu>9u# zyv)qa&dzRc#l-%uVCH<5Fzp9TaXzd2SVhic`eUyR&50Z#db+QbWmjm)XGYNc|zzE^b1jiP#T(5q+#p%LbBL3{J!=urS^jOcFH9d ze)fp?k_%Ush+}@)iL79J))S1|HOJY+jVs=RN#a@4?+Px=W_85v=NsqkCCGuEgDyFL zX1*lH%uh?CiFhK7V#Z5$uaC;CF72yCMgl|pvb5xxas}f{7mQoUUSlZLJv?HUnvs*9 z6`MvJ^XtOZjjM;I#Y4vj_MRBErc}&R>c4Pee%7^YN|?Ht^U)P=gQljvJZCmZbQf!4 zVfh&U&CwM!zHvCxW-!0M-`F#-G$xGuj=0^*9e&U0Pcjy5ZlfsOZ3NSEjXqm?9)7tPPUYvaJ$B$6E0jn4F9EiwFQdZ|`Y9ja>xxA-IBmT2geC|V)3Lrsk>;fQ~`Q<&lH z{`DBPQ^+5s0jP%n zLU4!u5cR`b-A-F!AAW-H3*Jm5lvSrHjvJxOby}aX+wF0T(C>u}n(CxOsi^U#JJ-&l z#ta3VD%3>E*6TFxW%?XltCdq#@8td6ODVA-r~^W58U&xjKJ8bOHSDhj3*oO)l)3EB z2L15673C<#pngWcb?^@<%0ci5{QaO0{;P_z1KcGDq2N)%Lq)S(U* zpzxrg%m+8XFF3x4$0;B2c||z^9zwha+y`C+cccGK#o9KI`i+8lA|~`^vms;yxE}!> z+zOV1lvoPl@zeu~(hVMj{~?z8Fqi;oph=Jhnoz9015*9h;1j4HSCqHGBk2FmXDdoKxDozjjtdZHn7)Xe0?G#< z^_Ku+*$B*_0m^ZZI=l_yXw+{i%658RgP zlqbPM@F!A*C4j#Es{3JdVT2(oJB5}2dOq0#G2^z!T{xnP1O&ARNoI`3G}OqvJ<5G z4v^~GK`f2lX2V87Lzcqv3<5=*;0LivdcLB3pwR+;vDOo#ZWeJYl!9-9)LjRNndt3` zvIe9jss{IfL6GXUfs~JXDA2KvK8OQ6!9->Y9KI<{ok68DyUSb_%?OdbkPqEHWIwmUFQN;H9 zSZk~$>#aPY!>k>wkFx%W^Q%Z>eDMi8PH_V5Gg{);S)XNniS<#|pRwM|`g_*dtp8&D zCvGqGS3x@jM$ZH37ocf;vBU*uIN>|iud%+y`ZDVU*47@mLmHi0A7hmm(1oiPM<1Di zi?sFbD`Y*IqQ)0rv7;KN02w_RRM3u2$s{h))~grW-_+LoHij6*C-JzGeTa*+_3HIl zageNq^=ezOa@+!_pokMb=7b=A8QCVyxbF4E?z8&=yU!s+WfMH_;~X!?Q%^>ZGR3VA zh-r>n9~rdcDBg_IgX}4eN0k)EL5j20iMKex&z`%i$9cd@taIt%ht1)7Trb4u5X<$% zinyj3@8HoZcR7$y0eGwVW4b*)X|$iCJ{I9wHZ z^-S1!G5=5zzWbu#i25cxW_=Qh6QR?m8}SvV0>hW{Yc<=J=ZxPA25n_!#yh@^TA4BG Q3*i5c=Kp_uUfi310mU!QMgRZ+ delta 2552 zcmZ{mZ%AHM9LLY&zaHm*=caD1J^ssCy4-w7T^@UyYY^SQmc*!JLP8CMjr4`k6IVt- z&|YX)BFM}@$6m-bcqBFwl5pUwkn)AlUdT3Rl)(mT`C_m>zk7ZU8x9Yi=X1WlKj+;0 zyXV~N%JFZy#uBB85)-zyh-0E;{6yETJ9&?-84N3S8uR)1Y-?%SF(OvlV!`-dUHkeA zomy9Gd$BQ@m=fj2ln1XxS{pYR9mCRIWsF40{5>wo#GrISOk3)Q$laWvBP%ah$%>{D zxo<{-j=WTmpH+~`&M(SL%@tKgg8zzN$lOsslzOhDF_Ic9jb>CYkxR>Rc>J4u#*HU~ zYi0ZWVJDu7Iv;foZyW!b`Uki1AIo))O;^OH=I?an^v&Eh6D$$%iZRWLaGx>Wf}7w*O0<7k^;8}>5TZp>h@V_z1u#y8CmcesT%;T{t2JKAMfOX8gR zFTzUvGmbV1U&Wt*ov}N#gHkIxfJM(eqGl@(N^2d2^0-0(N5`%QQi2Wr=@; zaVIv(i9^Y0fz;k>axBUxbv%n{l*XK*=A4lAnZ> z#^crWybNp$h6WsU8W4k2$*Xd-8=The;GfEJU#5A;(QJgDL78q8awT5U(Vm1-qFyMs zmw=MTo(kjRkcqt(N6RA)?K}p;pD-xImVV=2 z6F>a{b(i+F>PM=FR7Yh&+B>Rus_szztZJ!(%vbNUZyvF@7zQ-prs^}QudAL^{hLlO zt@^U+Rn_NJ-&B2C^#j$O>PUfHuFv~H4Y{F#)1`X1>VNeD8dS?COD;IB`X|*Ls+TqY z4b`)%KTv&6^{8mpH>cDvr2$7(|E#)R^)1y=)eZXj`&%#Ii0WTezpeUvjZZ&P*|CM} zG5LJT`X-lzB6|9J@+CIWy&Okri*(URlB6A=i>{E(MSF=ZI{m%sW-L1Wefv=T`aLp# zs9ue@^-Y^5QAWu9yak$gx>H)8R~xZU)J~y)pCd=enoGnM*Z>Z z@cxatpoXg)U};i0NjR(ePu0WXq`giTf4aS;`7t$orFw~jFYP_m>HiBZVGGlBedD7- zLm2Mv>`8q+ouK}`TXgjneR|7$Q(N@!8qYV*HCar0x=k^7QeW7jM}m9%4+U+pldevis, lenListeDevis(tabTravaux[i]->ldevis)); return (tabTravaux); } diff --git a/srcs/main.c b/srcs/main.c index 735bf45..3fc2887 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -8,8 +8,6 @@ int main() int p_tlog; tabTravaux = loadOffre(); - for (int i = 0; i < TMAXTRAV; i++) - triFusionListeDevis(&tabTravaux[i]->ldevis, lenListeDevis(tabTravaux[i]->ldevis)); minTravaux(tabTravaux); diff --git a/srcs/part4.c b/srcs/part4.c index 7b420cf..5a66271 100644 --- a/srcs/part4.c +++ b/srcs/part4.c @@ -35,4 +35,6 @@ void traiterTaches(Tache **tabTache, int p_tmax) exit(1); } } + + // nouveau tri fusion pour l'ordre des taches } \ No newline at end of file diff --git a/srcs/structures.c b/srcs/structures.c index ef39c22..27821d8 100644 --- a/srcs/structures.c +++ b/srcs/structures.c @@ -212,6 +212,22 @@ int max(int a, int b) return (b); } +int calculerDureeProjet(Tache **tachesTriees, int nbTaches) +{ + int i; + int dureeProjet; + int finTache; + + dureeProjet = 0; + for (i = 0; i < nbTaches; i++) + { + finTache = tachesTriees[i]->dateDebut + tachesTriees[i]->duree; + if (finTache > dureeProjet) + dureeProjet = finTache; + } + return (dureeProjet); +} + /*--------------informations------------*/ // Retourne une liste des successeurs pour un travail donne @@ -239,6 +255,14 @@ Tache* trouverTache(Tache **tabTache, int nbTaches, char *nom) return (NULL); } +void listerTachesRestantes(Tache **tachesTriees, int nbTaches, int date) +{ + printf("Taches restantes a realiser :\n"); + for (int i = 0; i < nbTaches; i++) + if (tachesTriees[i]->dateDebut >= date) + printf("Tache: %s\n", tachesTriees[i]->tache); +} + /*---------------affichages--------------*/ // Affiche les details d'un devis @@ -252,8 +276,9 @@ void displayDevis(Devis d) void displayOffre(Offre *o) { trace("displayOffre"); - printf("\n%s\n", o->travaux); + printf("%s\n", o->travaux); displayListeDevis(o->ldevis); + printf("\n"); } // Affiche les details de la liste de devis @@ -312,13 +337,22 @@ void afficherDevisEntreprise(Offre **tabTravaux) void displayPrecedences(Precedence *tabP, int tlog) { trace("displayPrecedences"); + int i; printf("Liste des precedences :\n"); - for (int i = 0; i < tlog; i++) { + for (i = 0; i < tlog; i++) { printf("\t%s\t\t : \t%s\n", tabP[i].travauxPrec, tabP[i].travauxSucc); } } +void afficherTaches(Tache **tachesTriees, int p_tmax) +{ + int i; + + printf("Tâches triées par date de début :\n"); + for (i = 0; i < p_tmax; i++) + printf("la tache: %s, debute : %d\n", tachesTriees[i]->tache, tachesTriees[i]->dateDebut); +} // Partie 4 (à trier)