From 89fb00f02c75fe90c26d99193a7820372622d2d1 Mon Sep 17 00:00:00 2001 From: "thibaud.la_riviere-gillet" Date: Fri, 12 Jan 2024 22:24:53 +0100 Subject: [PATCH] erreure de insertSucc corrigee, partie 3 ok --- SAE2 | Bin 36376 -> 36424 bytes obj/charge.o | Bin 5600 -> 6224 bytes obj/main.o | Bin 816 -> 864 bytes obj/structures.o | Bin 9168 -> 9160 bytes srcs/charge.c | 13 +++++++------ srcs/main.c | 2 ++ srcs/structures.c | 26 ++++++++++++++------------ 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/SAE2 b/SAE2 index 1aa55b72be1f1719415493eeaf7ea44a941492b0..2dc0b25b0c1bf0db52d72151ba6facc91ce9b954 100755 GIT binary patch delta 4477 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 delta 4175 zcmZ8k4^&iD8vpKlZxCuQP{#oUW^j-h>Z*8mUza2l||PrHVGGkaXj423yE*-)O5wXZ zwvk*yqF9%ZW!@zM2*^jtbM*kTu`AgPphy0G92d#_J)bljr?GfZr}FIrh@(r!vl7u1 z@&4tx5BB-;o@)8|i=CeLPydZIiWbtz&WMW>+jl6dB%x)5yb?Y|{>0)}#@+^iX3{ZN z+7iKvq}!}>Lbw!Rq@S}{n#pWP6Q*Baq-R2*2~^(RE7*DT{4a4@ipSvVQp#Hk!f^f3^ZN6pZzj1NJU}Qf3@WStF6!ikZ)1Po$jJT!+jYZgfC+(lV)fsW*Wub5Tst&|y%W_TH6_zl zb}m}WywMA#v&pm(fsq_$x1ya=ObT7k?2{fO+d5h&Eg+!_QfLTTKg|4-=a5)7BPN|R zGe^u8;bsW?CZoq-4jgi9k&R{J8Bsa13oY50O^?7{FA^{Ml6c40|OmLF!ATOWCQovWI#? zG5Amn@DK)kK#UzmT|302(JZtNjJKxIr8o{n`_M3}UqJ1Fm*6ws1K|Hq^e)ZEIo|_T z|5CP5r^BeJE-s`UhSI2o9o1z;nsEAn7^5t^E}a^gUpJXVGTd^aWlQua(qKAOv2FTA z;afB44=Pz*I($XNzS1X>j~IzJMK)y8PUHj5T*##7RcvPb3Mqd&Jdq|ckc~pUy*t^)DSFS3S=5V!T()b1tF>j*=kAQ`SN1rNx^}pf zP3wc4igS{gdV^dT=Tgk{sUU|%8Su_(rkjIYBZ-^aRex z)$p~fz&d@#k~+t*d=>o_`5+gHTqqvAP>r=KaD{20%U2F`U>VSvY{@k3x^J}BuBiW) zKv&Qb(DEQ|qde~p&SNdf<)cf2u0Wrv^w%(iH_!u9-LzrZ<3lH(=nPdsj zXyvP%-ARs)5Ou=?n9INpx%05hGLx5)KeGDdbW+KVCa;rP@@R5Ld`dA<_vF!^1tlH- zV%t&;

`?HJuc({#1*UosY*XGA)<(H`dU)U9O(v9#rCAP zNgw3X1U4%pk7TpD3>`^fFJ@el^s{I`tIKSWoU`bg9r4pIisW;4*PKjFv!t9X@;Y0Y z^J>^0ysP92d!DIsw+O~z_Dt>+a+V#;)soGuD>s)s&VI->knfnrl1FZ^C6+n(U~18h zd*?RZ+8C*P2nNPmyXOD5p1}gjPxEy zy~3s%M^z=fAYeqRaf!b9*mS3$PsO&fVwY{RZBs4u3J#kSQ|X$IshI0_p;eUkz@=>XQhSZthMv~I zCt{VY0xpX+?tq^=C9HvsxcpEqdgiEvPN^2&L-KS9VjG;09F@V)&mrBOjM|nIqPTw< znV#f8NFIC`T$2>XenP%G2YLGzxGhy}D05*+*(+d=3iS(cg}&wT>J{@{RU70y!fUGX zb-~BHfuaT%iY`>5sN4=8s~o=u0-xe+cLmN4K1uG`ysHM}oAa>`ygtT*#}e;5NXPF3 zI5;*%!FVDA*b<}Q$2s1LRUzwFbKDcHUwKQr=tA;$&Wp_Lrxa|i4kpXPWY$3>GAdv5@H0FH2C9~Wfvl(li( zJykJym*e(C1)m6Fqk_+JJcxf`a0nMT?&DiHz%kyVf%)%b?7?PevO)}U!2-NTa0v2? zP|ipKk5IrXTgJh^b&(wR;G00!Pv*FQuV>`AC_$Mwb6kwaP}a{wyi#6JjrV{|EaZX` zJm4}e;dqc2T{*`E)0O#Jj+^mMnylZ67<+jb_%t)JOXoQ{iaj|BpBaTe8->r0!v7wH zza53Y|1Dk)H-AgO?NJzS!r!>99)%~2!dS47$;j@kaCs!3Tr5$AVYRz09Vd5R7uZ`3 zGgV%_0BSZ@O7s|PoH~ID(jCdJ-UKS$ncH5ol>Hk z7a~@5_HEZ}?C-1CfACb{wkBv^a4cG?t=sCX+t^%m`RG{dKRxjWmW?|BS61KHrg#kh1FA1}#sB~S diff --git a/obj/charge.o b/obj/charge.o index 821b33e323a9e5163fd33f76ad14eb9e95142a29..145c5da8d13df07f59658f7f57dc891b8448c450 100644 GIT binary patch delta 2141 zcmZvdUrgIo6vt0tK!0s%p_cuC4XGO&bX{2~Fc|n-8ix;>W|>MNQ#LUC*+_6|pgaq3dKRWkxAP-k(|T$& zXC^gH(b#z91`=0rMsZ%fKHjyFw9@AG7EHF~ z+QQ(bT<6cNEq(i1snO?V#KHVhF=j5wLq2I0k4^hU-0ZTQ)zq?-KXylS6!>!z4&l_i z4o7gari7MaJ+wX*rgah0N-dusJAG5On{Yv8x9SGNBUm5 z(9=Wdk-N7q><&Zw!r{IP!(n%eoA!m>B!;Z7=I!gXkVSlBysDQJ%jbe4CLUV# z$Xj?bnuvTOU?ov#NYNMs@eqC8obLpmM!rMQXa?(%F9i>Se`D4C;18e&Tm}z-i=bS8 z9<0FpIYr|N*gzEV4Pqb*dqG*)4emx^r=k%AQRr(1Tfqi!7xI2ZqX?AqY+yO!W<}#s zzKTBp%Mkxf(OBVl94sXVg_hF;GUmZnk+SInUMzPBb_nbQYru9;UYDCWm#5mE2IclK za3{9;RM8j%n-Q-94}vaGu44n`CMK(rUKDH?Ib zd=V`2M;dUUc4RZhISlNGWqxhFGLQ3nbSw`udy4%R%$0dfQ~6c)r`T_>SFnG?zDIe4 z&U3)a1?}vO?DE%CZqUMhoEvCke}?@f_QzcRI{T08XV|}FKcDsp(G&;X;evPB$Jx)Y z&$7SBzQFEd|CYUt8~Te~XRpK?A&*B~|C)5{PwN~Qy=kXkO!NNsnf6nf%|Ng`e zcGZSQhHC>y#Luo>Cj-sIfx7G{I|wvoli5*r5ICGoW=GjUpiy{Bru2G$rY4Xb)%ock DW4v8{ delta 1595 zcmaKsQAk^76vs~ztKKY&iC%YSRb188M2(G_*-5#QF$xpHklH>Jx;fS%lh#%?%dm4q za1TD@!Ss{S+IGZYnUBU&E{vl-qGEN}(HR`Us0)$x3L+mmqJa9Ox(4LC7%2k(J zm>kG0u6(~tV?(()*Ff&E70qyN3-we*ng7lEF)!-sf|SWKr1_^Sx^o>p17poOUdY1A z$IEKmUFyBJyK7~UeEIeJi@UC+3+|Ldo%9@2cRY*n&-H#4Ve9vS39v~Gmo*)aAUg^xM|MQhj)3nV9spZFycbjpu7W)GGRWQ2Aa}n3 z`tkh*O*;WLsb^(P241$%2rQy%eU{M-Ghsnx`>Y_Zehn`ua}{g==fMteM&b!DqQ3E2 zy`6}@3)>HRK&~zVc~74>^xn*aTsHyoI{QGb3xm8XCKyq_`>d)q*d|^N9Ld;*ro9HX zsn`8Fdkco68B1&0^ZBeT*#ry^E;glUkLR<)lKl*Zt&4r4X&=pJulg;6R}+PW)os63 zlV1~zpMej=@?tptOk3sr;W(dtFYdy11_LjCbm70@56;8Ouu{HO#BK4Ec(3@Rc)$3d z_($UX;-6}dQ&a+{q#z`IPJFNUdGTHGZ^bvolj0fi%i`aO|0q5t{&U{rL?-yhvEa`KZ(z>+qe@FxF!W>#UF^Ti5DKpBD;%d+fYZ$ w51ki_mwqq@o#m$o+P)n9qOHA~WYn$Rv#QmgRiP$vr>sk6N4St{$Dz{KD_TJEe*gdg diff --git a/obj/main.o b/obj/main.o index 12067c4fdffab43a4a6f5e5ea783b23d734a8dbe..ae18945f52d965367b63a4f9c10f4ea5729f8855 100644 GIT binary patch delta 314 zcmdnM_JD1IgWv`R2JQO+Kc8O2{HlM7C?e^;!PzK#SCO8O#Eoh zTL4tW36cPcBuqAClxJj}oXDs?xqy*patEV3 z*%=sgCmS${)N=qC5PwJ#SCNzO#Eoh zn*dbB0pvUY(gBlA8RZ#SCMPngPcC5OncTtXKKVMMCS%BCMka9}Daj;1*?~!M P85kx%X40N4#q0zCx>X#g diff --git a/obj/structures.o b/obj/structures.o index da3e5a8b58e7d2aca201ba31948c196db69fba9e..1d564cc4f90257e021fc97a9d9f9deb08739fc9a 100644 GIT binary patch delta 2120 zcmYk7U1(cn7{}jq(dNu{O_tQAvo@XEMU~Y}kTqytn)tD_CYvqvqKMUAh!qTQGaPWA*=-781?oK2YrZPQ(h z#X}se>6W8$*NG*ZN>J19xKq9H5M|x#x%P;rYMvz@RU3B~qkT?^R&^t>K4+j)bK72J zi&ph)IrRTgh8?wnm#fld+(@sNn*%Yv2SDt6(qUmz4GuP&%YRY{q;_X$?4m_yL~GDB^9U zt%4G-fY@#M4W%6hbBNdRT%QF?ow)xJNF$H}Q=m+g1S9D9ywdJt14&&Cl>8QmZJqx@ zX;Yy56fx$*U=KoFN?XTvlzuhv2;y5x+dhQ*pG9IH+gZ3v-UKcDI(?hGN|wM^kzWGk zn-;)s47{MUGoVa34R#?uskCjpL!{q6DE;n+ae?P8zo)cojm7@c9Yz23Hi~{nkopRP zOFK+&(0@fv^54;xMP`t&=`Lmpd&Bc$$8K{sR4P)@SKI z({uFC#f$iNo`H{8@HTy#{vmyozCk}m|C;^}jxAZxE&4ew=svxl{vyw*yQnQnhYJk+ zzyaT*SLg-$BE3S7azOtX`a|-F`3GSR3+lmV4zCeuE0TLpJ@fGNWbFaxT4t?( e`0X+8AC&S`$XH1?lNgKm2kobM<46&|)*a|x~+3K3wtE=cn8LM_Mw1ObQkcxrZ zVh0f>wwyfdp+YKoXkib-mQhr21;q&!3fsd#gl>#2g9;)dsZ{3wyWhX=$wPa7=l6Zz zIrrw|o|`KJ>jN{ncr0PUcHL9PW?$=zSDWt#8!)WR&iDKmeCh#B7H9AFCD&srIR+OV zF-C?fF7Ng1Dm`w@tFZB+)be$bMxq!9SzYO}|3MdzHKPVTgyyt%+d&2au@aR0}uB>!5{Sqpy*d$rAVy@{^$KKoM-l!V^k62Fe9bf>Fdrlvdsz zGOv#Jj?DWrh5?>0|97P=FTI;Q&=BmrqIyuj2dS^HxU}8$Z|J`wC;9K`m*_X?pVNP% zkJIb)A^JV~GwOkP5!)m!&VoVu3Esem^e*~mboqdCL$ma&oc{y;0{treEd37s&Cv0! z{J}t;1%K1C^d!DtX^r$OeV8}!EPWsS5dAOKAEp09f1UoNc!2I010S>C9r_#efZju& zqwl4EP5%c!J+dRe(2wwj?$ML z?fjSx;f7l9KaSUkG>3ojD4&6hF>i-~(nDe1{LF$hPK~q%E>OUt(r{41`feP5X*j8& zZ`04RzDi$Ye$0K;dB9t6i=9XF6|Q}nwL3q5Mb=K^)gi6Md=_s8Y4TLa&F9<;slIp_ Q=Uv(ttg0=2n(B-E3$ym`vj6}9 diff --git a/srcs/charge.c b/srcs/charge.c index 64da314..033acba 100644 --- a/srcs/charge.c +++ b/srcs/charge.c @@ -121,13 +121,13 @@ Precedence *loadPrec(int *tmax, int *tlog) prec=fopen("files/precedences.txt", "r"); (*tmax)=5; (*tlog)=0; - if (prec == NULL) + if (!prec) { printf("\033[0;31mErreur: \033[0mouverture de 'precedence.txt'\n"); exit(1); } tabP = (Precedence *)malloc((*tmax) * sizeof(Precedence)); - if (tabP == NULL) + if (!tabP) { printf("\033[0;31mErreur: \033[0mmalloc loadPrec\n"); exit(1); @@ -140,7 +140,7 @@ Precedence *loadPrec(int *tmax, int *tlog) { (*tmax)+=5; s = (Precedence *)realloc(tabP, (*tmax) * sizeof(Precedence)); - if (s==NULL) + if (!s) { printf("\033[0;31mErreur: \033[0mreallocation pour fichier précédence\n"); exit(1); @@ -169,8 +169,9 @@ Tache **loadTaches(Offre *tabTravaux[]) Precedence *prec; int i, tmaxPrec, tlogPrec; Tache *t, **tabTache; - tabTache = (Tache **)malloc(8*sizeof(Tache *)); - if (tabTache == NULL) + + tabTache = (Tache **)malloc(TMAXTRAV*sizeof(Tache *)); + if (!tabTache) { printf("\033[0;31mErreur: \033[0mmalloc tableau tache\n"); exit(1); @@ -178,7 +179,7 @@ Tache **loadTaches(Offre *tabTravaux[]) for (i=0; inxt=l->nxt; - l->nxt=ms; - strcpy(ms->tache, travaux); + ms = (MaillonSucc *)malloc(sizeof(MaillonSucc)); + if (ms == NULL) + { + printf("\033[0;31mErreur: \033[0mmalloc liste successeurs\n"); + exit(1); + } - return l; + ms->nxt = l; + l = ms; + strcpy(ms->tache, travaux); + + return l; } + //file void enfiler(ListeAttente *file, Tache *tache) {