From 5de2f25e3c799d8a0e87325ea79316f75157705e Mon Sep 17 00:00:00 2001
From: "louis.germain" <louis.germain@etu.uca.fr>
Date: Tue, 9 Jan 2024 21:34:20 +0100
Subject: [PATCH] Gestion d'erreyrs

---
 SAE2              | Bin 22696 -> 22696 bytes
 obj/charge.o      | Bin 6632 -> 7176 bytes
 obj/sort.o        | Bin 4336 -> 4944 bytes
 obj/structures.o  | Bin 6440 -> 8144 bytes
 srcs/charge.c     |  10 ++++++++--
 srcs/sort.c       |  10 ++++++++--
 srcs/structures.c |  32 ++++++++++++++++++++++++++------
 7 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/SAE2 b/SAE2
index 8605816051b6ff3c6fc454a01f2e6d36eaf80713..072c67939d0363e59e9d362027b29582c7065769 100755
GIT binary patch
delta 5999
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
b&GhD5^yWnOJ?SmB#FTKy=*@S%--`bQV7KNb

delta 4632
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
J^H}8-@xQyrWrY9$

diff --git a/obj/charge.o b/obj/charge.o
index 071a33a8f77aef1464b92562fe010a453df19888..b224f47d7e42ccdb3d5cbface0b5f4bd0fa8e0c9 100644
GIT binary patch
literal 7176
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
Rs^0uZ$iQS}rq}S#{|{HGNyGpE

delta 2270
zcmZ`)U1$?o6rP#1X~twy6O&FR(OO;I{<yRje=1l~tBC2c)Ln~O3u;@NYPH0+c4cAN
zMy!fO5$loqph%U4tso-w#a&oXS_K8seGozVV8vhP!&+GJLARbWb8k5Ya^T)O_dDPH
z&d=OQPOf>o;%tdFQZQJyaIon=XjZr7zB{ET3fxkE%}Jcv_%AHe%3=*OGc&ZgKejb7
z@TwuvKh>BR_-!OH@bmEKMQxP|ldksB#+(6lbUJsp3Pt*SIG@+(BAtbL3>JG<Lzib$
zq(^D*=u94}XiFaMI8@&IOD_`0khB0o`geup<rNO2t7q)mp0R6f$<&_YED=)rz4SC4
zsP)f1p=~hS8~a__TVI|Bq4_x0;UJ5uI7yBxtP-OLp=KOpaqdSA*GijWYaDYZN-M2W
zL)&Qw!5G!b?}E_JMO=Nh0wpmn{M}#qJIN1sA{KbOkF{w9o_XulwJ_;5p~%XCm)?+7
zhX;d-s@N6cvt0$Q+lZy^w7J8+eY#I`BE%tJY}dc1E~B+Vw^5^C7rTD=(<s&}avfhc
zyfgYB<u7)3^>n0q+u^+bl9liHlpI{WI6mP!CR+rR`KJ0UwBWoP2J_8ym0(g_QY;nw
zYO#`nABR-fB5=uHCHC9Jn#u3T;Ma(K%2|VUiafv(xPxgO&mwmrL#|%zFJ<B1$l%K~
zN3-znI(U;J>uV9j2U!kG2wd{p#eOmiKMYp_W?eDeA2fMNek_#&r!LOLA-leo;ReHh
zgnv-&F!KhP_hd#C*`#xf&!b$1%AjeDFfWhwH^s6ZGjE8+nt<+rsZPOQ&`d9-ve2js
zx{0!iYKEH(-^_3xaR<ZsEj}P{TIkM>;~?vDaJL=U2cIz&E_Z^-@wA4r;I{=%3x%1X
z7-$a}KZ1K%UX}Phscg%^-S$`40JR}Ay-T>IoL6)*nSmPu-_PV?EKHi=yu5P^FJS!3
z4h~O4f%IL*;T?S{aGBc@k;4Sz`<UiyhVvXgF`VoBsV9n3HhbZJ5CP^n4(E-r01Kcl
z{Ebn_kUn@HHq$p4zleD!8NP_&>*>Xz$--pQ>oV|8kx#wANsc$Y*}>P(3Y``QlI#HQ
z&_Rat4xNFY3QYA0&FMFSBa<5!np5m7*Zjb6uG!?aYn;vPf1$Hi;8YC1s7D<f{xAdD
zkQ@Fo<CgqiYIBrqDN4%+frx3z|Dll#?{%n+m}&*=h&<AU-B4y#>GV^Mb|eq>TdTF_
zZg@YZ0B%_&^6{fpqCXdT<w0q5jp~8cXpO2n#Aqo#y@<xOn_*ZSBe)f31Fpv6bJo$V
KMr%<pQsEbfTPo)O

diff --git a/obj/sort.o b/obj/sort.o
index 1ba95ce5583ba89523c57c2a29227ba52e5f24de..d5e41741cbbc5a23383cd6a0dd195b3624117b3c 100644
GIT binary patch
delta 1744
zcmZ`)T}V_x6rQ=a++E$DYenlq;R+V^3nHcTV=Z=dZ>(DDDpEl$mL+J}T3Jw7NP$V9
zoP6pbqo5ulh<YgKAvKVqtVds>q9UULDT0E~&Y3&2U3T*<XJ+<0=X~Fsxp%nJMX#0*
zlxT)AxN>=Z^wMUA_JD>d8U}YfT$%-rn|~<wS?7!a*9u?_H~4j^<VWB+FF>TwAMH1%
zqy1aM(esZ3=VLI#S1<c9Gdnvl@N}#(+V?Tq`!yWxJ2RC<4V79;_Ac&S(`tA&3{(0q
zBXh^_X5Q^A@ZQDw1-u9MymAfx!f~@Inutf5B8|;qfk?d8s{0>Y9XHLG)sQf^nN3!M
zte_K6eASH&R(+j_nlZE1tV^gYTd&4!NLcl|>r^m~|0DmBGKp#<RxBp@l$uSHh+DQ+
z=62v#&I*{!DejpdvWVZfpjG*Dw5MK|o3SMbZ6X|P13t5KTwlj2f#Q28h_;u8bp0+-
zA4cdj;b?oD^=7ZG#{~roV{BN_<YgvtJBfszpp%W$kQN$EZ}bD<XcbNly^ILpt}g`B
zu2*~lM%)|WgL_e^0y7sd&P3a|7VY6&1@GKJUPEIjA#>asF3?1aIJb!CAzTr|K^YYd
zB6gahkzN@c({X_&I>Y%2y3n0RsO$#kJLrTD%_kJQfZv|d6`iTJ!^c`#*RfPfM<?rO
zJDf-*Pb80@Wcv@av;A#do$bj}^{uU`1F$pqNTFT1(4H7=i^%@W+O`x%a)VZfjFP<9
z5xqJG{#xRSZIS%{iP)0Y>8#O+&5y3MMjd#-fq$O^56UxCDyy)DtO(BK1xu@ClvMK3
zl}dj`Rg6l|hNvp^&{5^=REKwYLB5v8p7-+UDBX6OfPIrVDdwRoMK=LxG|@RLylf8q
zi^LWGWhzGdY2&*DkyBuueEbw&fUX3Z9XLG#g?G<^_d>)QEWIhCO8!1plHGMwIn@(z
z)Eng8VtfRB-Yu589{WTc6E799sVi|d16P;fMg~3x`MzLiLLP_sLSP0lkq<${_maPW
ze1Cbacq^$|hq!;e=5yiYT@1ti619BmFYy>I%3y2~uDKUNaiCb6a>4dMrDo7w$MgVx
lnB4FT5f*@40|Oq|Zd7_Is9m&C7&OW~x9HtOOTwVP@Gn>@cd!5e

delta 1126
zcmZ`&O=uHQ5Pt9FuiNHt*S2d!X)V~MwFiSg1zTf+1QV=Q!J~(6Z3C6orhlR$Xpo2y
zl%{j?7K<R(f<Fb(LumxTgM!vmMGqc?7*CCdqEghE&2CtPelRm{zi(#Vn|-_QTi15Z
z1jS=duA?=ly^vnVHW;GhgMEBAe+2z}42rx3KJbQZ@mq&T`$jIFjjhGAk>+@&;LAjy
zUUc#zL`6L$#lYf6ag;;I{u2&59xkpsRPKz&dVBl!LebUkq-w^%SF`Kt60M?M{|#}(
z;}p-`t{TR+Bh^DZVn0V`>b5<c5=cKoBH{!&Qx^%nz8R@2#3PPb>tok#wy55MHKUd{
z+x*6dY7<NnYkD7jqgSLMo{_6=^rU*wuf!wTtQ*-{Xcv(EfmzuOozh#r1iz&228D5^
zPmBfnWEgvZ*Qz|B`{U%{q+-`Ie^5(=J|jkr)Ibtf)F&cHGbY4%nbc?+SEOcbq%o$C
zhVc#>@fka@#yA)k(1`DL5Q}3#s4mntIW=*1G{r`T&!3*qE@;yi+2HVGYDBx#mrPC!
zvB9AcmYSZLglyed!n_G;T!*&tw}RW$4)H&K)0m2Q51N^uhn!mt+&5Gjj*eui3-Hpd
zhCXjn+hn{8>M2{Q(on{#Hx_k^MP1*7Uxu_t<=@GNK2b{q1qIDK&mRk4Z{c@9)T{D#
z8274ylJQO{wb7E}h84^?1tss{g!wh}qfVeBk(qaY4c7#dH*fu3g|6~h8270G^LF+B
z(^Az9cYW{p0F3*)Y74cM(k~pI`VWXXC&*IctQ<5}5Rrq@obijgpzLpg8F{OC;DmWO
oELJMnN>Hpip+gCayc^D8Sard?5|)_Jy8vaSON!I=A~fpq4-T>V{r~^~

diff --git a/obj/structures.o b/obj/structures.o
index 614a21b34e6ec979e7cc2ddd939b9b6b341ea668..25aeab34bf606d2aeeedcc2a4c60026fbb8263ab 100644
GIT binary patch
literal 8144
zcmbtYeQX>@6`!;7;h3axOPYo{iWZ1lH#Ao}RSM*z_-mcD<gfVbgs1`Ma$b`wcjsg8
zF15ifsZ1lS4h#QLiAc0kS|LH9|DZw@l$4mHtwAafAt;qFk`)!nQG!U3|8P`G=DpcB
zd++A<oCqelo0;GH&F{T=GqXGA@0y+M6`_z&B_y5}g`Pr%nBHD!H_2v`*d#WJ0n7cT
zHFXe?3;4C*x4w2&+9q!qmOHUf!ns_p*p_Q9S$X^nELiRbmOCp&<QHH|mfK>W{r8^W
z>dtDw*;0u!YjR>qY<_8G^IJ2dGI^^EQwGumF?&(?^n02Gy2))N_i_T4F_|=#E}Ui!
zOlh0thAj7R6?9={1ND~M4AC6kR>(pxpRr1zo0~70*=57m$26`UfVp7hdp$3%tf7zj
zB`iNM&+-q!EZk-G;BH}+`Jy|><cl-8YMFr>zlK;*mR8&|yGX;;7b@pox2dYAPwQdL
znoFR9GB5-=@0H}lmkTtZ*K)(a22lhLyGt%+&1H=1X3eCz9D)c6laoohkvEs`QQ>iK
zw4V-GSD5U6bNTsoP`l=GsrnzddV@S~uvy%Jxsu#an3Tnv2QiJYYnFS>`tAH0>oKe<
zEcXhyn72aLtf}4|(p%wJ!fLL;DNdS8AsN=(_{Dqn?i~b}(5$&Avz5%7i>vvUk-&cO
zp9<i9?_I`tF~hd@2jPC3G#4S>#r@{ocpj!y{4|kq<tOU%xt;kgJd$`wYMR|U&F<}>
z{V?r6+~C~$&l@`CkkQ~Rgd5iIH?{s8oA$Q{*DO3#Z|=mfSJK;7(lsmTs+9)M-Q+v+
zQQ=90YxxBD>vTb_7b3h+vJXmu{DZh6)|5H(n;qCt2Mz$gJ-HBiuWjuNoW22&M1!AW
z*Ib;OSX{~7Ps%d78xO$a50~qlHMQkksh>A5;KqV;#**QhxAW%h$(axkm0x@==sB{y
zAb~q&$wTJ;QSn#xVlLf0j@grLi{3J@pPqu*fGeC$;K>in`OW>F9xkZL`YYDdzzo2!
zUju~zS1%Q@Yd8Eey3M1V9g%*s%{<Z(F(g*7^t8A4nK~%xMWET$+kdPKTq@Dg9Wnd*
zNdOk4_L+wLPc|k^$FXzHJ_EYRXd*EZi)P~^DI<CH_2fw0v5j~tV>=S+ipIg7YO_zr
zGZd?*85wA8T~*f;HWKkn);2P^Sj^63z^PJcGdl~zgW}5M(rE|AU|>VhRL01qY*ITN
zAF@Stb#q&v8Ht!ia>%I5R0Gi6(^cpwYl0cQwzn9aW_QVA&<w%U)%;aZGrRly%-+5Z
za8k5dJzXt`n{7pKXQZEH#q-kE5$Wx0KE_wPF0%pu4|)F~?jj~%!)ln;22t%fF-S@h
zdIr>@77Z?$kY{afZ|`We%sv@K$($n5cqZ-`3ERkyrEOyfYA1R+nj1Ct8KPf<Qm`6X
zXC!y}>g!?HPld6mkt7aHJZh)1j-7Vm85_q_k^9F;kK`O!jS?O}`>G|=<1r`Rm?Bja
z!2J*qa9t)0I)_?Y_ZjtV_Q`lOWi&Q~_k<gFKlK>3j6Dr|8XFoL8>GK26kq7ueIhhk
z6RO>~zG@mCVtD;kS72E;-&b?CqIJ`{qd*|r0UCQ4Yh|zKlmr}eob2VskCS~D)@r<6
z(0`fiPjLIQ1^XqkPjGw1sPBJ{>@O7A$9?-U**D^yRr#-6A40-*fVLwJr3Jr~eWKw1
z0NKCJ?G?v-{o`bRzQ{i2+sDcNiz53QzWrsgKh5pla2ekvviEa)MUOvzj_ln<_72~^
zOm^u<&9Cx@a{f3ZsNj$_;^UPdTV>!cDIqH1Ur?z8rJzzN)&{|#vc3$CJF>J?ighL6
zeSkc`;>2~vf_05-6@Tq1gMS%t)KTN*82}9TN{~)R8N8Qtl2Bt&ddHxR`mRKUkY@zi
zLxjIcxI7!s9wGcX;qpvC`!sxl;`vS){0!jecaZkR3(&`shY#ZOgv&Dn*bm?nr2i7}
zZ&g48iabM5zXl)F3DcI4X9uvi;1i_tHu1kte0i1t`&}9SpNL;gTT7lT!2U+~MZ)Eo
z0_-Eg?+`A}5?~(_-bGtco*}?0Vg4BZj|i7%2k=_JgW~^e8T`>QxX5IkTr8V|7k@Y=
zQucG5czy70AA^TFds>=12jK-6G5ZJmn_D`~K>=@?RCXAtJ;TF}Exc<7>crAxzJjom
z>Fk&k^O_#nyXS~>E}IedXgn)CAOg1)F=QtM2-+fHr&tuw>xzzck0ee1J%`Q!7Vru@
z>DaxFJtW;H(;|_{dRp;JIuRZ7<}u`Tya=en97KnQ<FQk=BgsWhhT<tP{0$pob?n%w
ze(xm>$%mqz47lBJX_i;Kaz7fO;PQS7J_`Q=f>0EHtJf8Ksn+>lVfZF!E1e?@$7hSe
zpJDh0hGz*^epMW5U+aF)Y5XSY<2k~j^RIZYKd+<If1hfdKgV#~zbby*|5#L<DX%L&
zp<35j3;P)h;ygbO5w3K;Cs~DeEAl@LALaKErn80Nj;5pLInMZeea|wS$8%28QS*O=
z@p(KyVK|TH1BUZ;|F@=JMg2RB&*NN=iGiZ>vz>Sw3D@(pmEk;|dWQ4;*30mRz>muF
zi86Si41ShytnhsGP@L0@&*$~3#y>&)pO@jkt?`q@pDn}xP~%S!|9TnzCmP=+{#tsk
zV4ivW2MNbvINu)=|4<qJAj2O9zRL4!n$A0<^9JK{zyD%5-UXD7fdN8M@%){1b`h?}
z{{+J~!#JgrU^v%*mErh@5yihkxbmy^_blV{^Rl4vt0?dPVSGN{DteD9{cXhGL^uxP
z`n4K=5Ao|5pX={sxWVRiK-2jW>9jLG*Ez27j}U*j41b*AJDA^}X*yZb`6c6XzZW(B
zIpV)thW|d}e~$V62jhR9;Wrr0_w8D`I%EEKGX8^vV;DH}R}{~~jL+Arh2fuJIs**n
z&*u}G{$EJ{S;pu2`4;2z`M${be7=_$&iDVHnGVitnf%T%KKFZ@;e35-=^}!|QD-Ne
z=Q_eMpIoPr;r#h*01pf5P$;tBB)<zd&H>8_`CY)1)IX!)>i5KX4S$pRGa7!K`tusD
zejmV9SQZuMJoOC?SHA<AG+g}-IHBR{zJEr;)xG|_hO2x1jE1Xw{k(>&d%a4oieKI9
zML08-%tlW_oprqWlxjJ4A{x%xqgfFiie{rCd@_>}VQ0ka#72@y_!E!_r$(}N_)z!2
z?o2is`z8=@n0;z+*oh`>O6UJw8K8huqwVPHHBsw}>S9cNN`ud<g%<9~CLi${AJWD7
z8vV4!zfR#;^-Fsj@gE_awmG3fJg50p2HpSTU_j0Pb$la?MNM2kUPj4(LK9Z;D=z+y
z$MFpcp!y@6FqC?)^1oI5s%`;`YWpN;Y{WwzP;@Td&k@t(uc7hkeW;}L`1`;Rw0=Lu
zhdGop<PfKWW7T-IenGx*Ts=ONp^Q@gFdV#B>f;g9QVfU?=jq4rliGx}uE1>;G`^l5
MY*DFJ_|nJ!7YppQn*aa+

literal 6440
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
Q%72!AsM(UGevA752Yq{BRR910

diff --git a/srcs/charge.c b/srcs/charge.c
index b72173c..ea42206 100644
--- a/srcs/charge.c
+++ b/srcs/charge.c
@@ -5,6 +5,7 @@
 // initialisation des travaux 
 Offre **initTabTravaux(void)
 {
+    printf("*-*-* INITTABTRAVAUX *-*-*"); 
     Offre **tabTravaux; 
     
     tabTravaux = (Offre **)malloc(TMAXTRAV* sizeof(Offre *));
@@ -32,6 +33,7 @@ Offre **initTabTravaux(void)
 // Chargement d'une chaine de caracteres depuis un fichier
 char *readFromFile(FILE *file)
 {
+    printf("*-*-* READFROMFILE *-*-*"); 
     char *str, *buf, s[6];
     int i=0, tmax = 5;
     str = (char *)malloc(tmax*sizeof(char));
@@ -56,15 +58,16 @@ char *readFromFile(FILE *file)
             fgets(s, 5, file);
             strcat(str, s);
         }
-        printf("%s\n",str);
         i++;
     }
+    str[strlen(str)-1] = '\0';
     return str;
 }
 
 // Chargement d'un devis depuis un fichier
 void loadDevis(FILE *devisFile, Offre **tabTravaux)
 {
+    printf("*-*-* LOADDEVIS *-*-*"); 
     int	index;
     char	*travaux;
     Devis	d;
@@ -88,9 +91,10 @@ void loadDevis(FILE *devisFile, Offre **tabTravaux)
     tabTravaux[index]->ldevis = insert(tabTravaux[index]->ldevis, d);
 }
 
-// Chagement des ofrres depuis le fichier devis.txt
+// Chagement des offres depuis le fichier devis.txt
 Offre **loadOffre(void)
 {
+    printf("*-*-* LOADOFFRE *-*-*"); 
     Offre	**tabTravaux = initTabTravaux();
 
     FILE	*devisFile;
@@ -112,6 +116,7 @@ Offre **loadOffre(void)
 // Chargement des tâches depuis un fichier pour chaque offre
 Tache **loadTaches(Offre *tabTravaux[])
 {
+    printf("*-*-* LOADTACHES *-*-*"); 
 	Precedence *prec;
 	int i, tmaxPrec=5, tlogPrec;
 	Tache *t, **tabTache;
@@ -151,6 +156,7 @@ Tache **loadTaches(Offre *tabTravaux[])
 // Chargement des précédences depuis un fichier
 Precedence *loadPrec(int *tmax, int *tlog)
 {
+    printf("*-*-* LOADPREC *-*-*"); 
 	FILE *prec;
 	Precedence *tabP, *s;
 	prec=fopen("../files/précédence.txt", "r");
diff --git a/srcs/sort.c b/srcs/sort.c
index 2aa6daa..21cec89 100644
--- a/srcs/sort.c
+++ b/srcs/sort.c
@@ -6,6 +6,7 @@
 // Retourne l'indice de l'offre dans le tableau si elle est trouvée, sinon retourne -1
 int rechTravaux(char *travauxName, Offre **tabTravaux)
 {
+    printf("*-*-* RECHTRAVAUX *-*-*");
 	//On utilise la taille max de travaux car travaux est un tableau constant, sa taille max est égale à sa taille logique.
 	int deb=0, end=TMAXTRAV-1, mid;
 
@@ -28,6 +29,7 @@ int rechTravaux(char *travauxName, Offre **tabTravaux)
 // Affiche chaque offre gardee avec le devis ayant le prix le plus bas
 void minTravaux(Offre *tabTravaux[])
 {
+    printf("*-*-* MINTRAVAUX *-*-*");
 	int i;
 	MaillonDevis *minDev, *md, *s;
 	for(i=0; i<TMAXTRAV; i++)
@@ -53,10 +55,9 @@ void minTravaux(Offre *tabTravaux[])
 				else // On met else et pas else if car on ne peut pas garder 2 égaux, il faut qd même en supprimer un
 					s=md;
 			}
-			displayOffre(tabTravaux[i]);
 			md=md->suiv;
 			del(s);
-			printf("HELLO3\n");
+            displayOffre(tabTravaux[i]);
 		}
 		displayOffre(tabTravaux[i]);
 
@@ -72,6 +73,7 @@ void minTravaux(Offre *tabTravaux[])
 // Libère la mémoire d'une liste de devis
 void 	freeListeDevis(ListeDevis *ldevis)
 {
+    printf("*-*-* FREELISTEDEVIS *-*-*");
 	ListeDevis current = *ldevis;
 	ListeDevis next;
 
@@ -87,6 +89,7 @@ void 	freeListeDevis(ListeDevis *ldevis)
 // Boucle principale de fusion de listes de devis
 void	fusionDevisElements(ListeDevis *R, int *tlogR, ListeDevis *S, int *tlogS, ListeDevis *mergedList, ListeDevis *last, int *k)
 {
+    printf("*-*-* FUSIONDEVISELEMENTS *-*-*");
 	ListeDevis	*current;
 
 	while (*tlogR > 0 && *tlogS > 0)
@@ -121,6 +124,7 @@ void	fusionDevisElements(ListeDevis *R, int *tlogR, ListeDevis *S, int *tlogS, L
 // Gère les éléments restants après les itérations principales de fusion
 void	gestionElementsRestants(ListeDevis *mergedList, ListeDevis *last, ListeDevis *source, int *tlogSource, int *k)
 {
+    printf("*-*-* GESTIONELEMENTSRESTANTS *-*-*");
 	while (*tlogSource > 0)
 	{
 		if (!*mergedList)
@@ -141,6 +145,7 @@ void	gestionElementsRestants(ListeDevis *mergedList, ListeDevis *last, ListeDevi
 // Fusionne deux listes de devis triées en une seule liste triée
 void	fusionMaillonDevis(ListeDevis R, int tlogR, ListeDevis S, int tlogS, ListeDevis *T)
 {
+    printf("*-*-* FUSIONMAILLONDEVIS *-*-*");
 	ListeDevis	last;
 	ListeDevis	mergedList;
 	int		k;
@@ -158,6 +163,7 @@ void	fusionMaillonDevis(ListeDevis R, int tlogR, ListeDevis S, int tlogS, ListeD
 // Tri fusion sur une liste de devis
 void	triFusionListeDevis(ListeDevis ldevis, int tlog)
 {
+    printf("*-*-* TRIFUSIONLISTEDEVIS *-*-*");
 	ListeDevis	p;
 	ListeDevis	q;
 	ListeDevis	qTemp;
diff --git a/srcs/structures.c b/srcs/structures.c
index 02d652e..903bda8 100644
--- a/srcs/structures.c
+++ b/srcs/structures.c
@@ -5,12 +5,14 @@
 // Initialise une liste de devis
 ListeDevis newListeDevis(void)
 {
+    printf("*-*-* NEWLISTEDEVIS *-*-*");
 	return NULL;
 }
 
 // Initialise une nouvelle offre
 Offre *newOffre(char *travauxName)
 {
+    printf("*-*-* NEWOFFRE *-*-*");
 	Offre *o;
 	o = (Offre *)malloc(sizeof(Offre));
 	strcpy(o->travaux, travauxName);
@@ -21,6 +23,7 @@ Offre *newOffre(char *travauxName)
 // Initialise une liste (pour les successeurs)
 Liste newListe(void)
 {
+    printf("*-*-* NEWLISTE *-*-*");
 	return NULL;
 }
 
@@ -29,12 +32,14 @@ Liste newListe(void)
 // Verifie l'integrite d'une liste de devis
 Booleen emptyListe(ListeDevis l)
 {
+    printf("*-*-* EMPTYLISTE *-*-*");
 	return l==NULL;
 }
 
 // Vérifie l'intégrité de l'offre
 Booleen emptyOffre(Offre *o)
 {
+    printf("*-*-* EMPTYOFFRE *-*-*");
 	return emptyListe(o->ldevis);
 }
 
@@ -43,6 +48,7 @@ Booleen emptyOffre(Offre *o)
 // Insere un devis en tete de la liste des devis 
 ListeDevis insert(ListeDevis l, Devis d)
 {
+    printf("*-*-* INSERT *-*-*");
 	MaillonDevis *md;
 	md = (MaillonDevis *)malloc(sizeof(MaillonDevis));
 	if (md == NULL)
@@ -59,6 +65,7 @@ ListeDevis insert(ListeDevis l, Devis d)
 
 Liste insertSucc(Liste l, char travaux[])
 {
+    printf("*-*-* INSERTSUCC *-*-*");
 	MaillonSucc *ms;
 	ms = (MaillonSucc *)malloc(sizeof(MaillonSucc));
 	if (ms == NULL)
@@ -77,6 +84,7 @@ Liste insertSucc(Liste l, char travaux[])
 // Supprime le premier maillon de la liste de devis
 ListeDevis del(ListeDevis l)
 {
+    printf("*-*-* DEL *-*-*");
 	MaillonDevis *md;
 	if (l==NULL)
 	{
@@ -86,12 +94,16 @@ ListeDevis del(ListeDevis l)
 	if (l->suiv==NULL)
 		return newListeDevis();
 	md=l;
-	printf("HELLO\n");
 	l=l->suiv;
 	free(md->dev.nomE);
 	free(md->dev.adresse);
 	free(md);
-	printf("HELLO2\n");
+    md=NULL;
+	printf("\n\nADRESSE md %s\n", md->dev.adresse);
+    printf("\n\nNOM md %s\n", md->dev.nomE);
+    printf("\n\nADRESSE l %s\n", l->dev.adresse);
+    printf("\n\nNOM l %s\n", l->dev.nomE);
+     
 	return l;
 }
 
@@ -100,6 +112,7 @@ ListeDevis del(ListeDevis l)
 // Calcule la longueur de la liste de devis
 int lenListeDevis(ListeDevis l)
 {
+    printf("*-*-* LENLISTEDEVIS *-*-*");
 	int len=0;
 	while (l)
 	{
@@ -111,6 +124,7 @@ int lenListeDevis(ListeDevis l)
 
 int lenMaxNomEntreprise(ListeDevis ldevis) 
 {
+    printf("*-*-* LENMAXNOMENTREPRISE *-*-*");
 	int maxLen;
 	int len;
 
@@ -128,6 +142,7 @@ int lenMaxNomEntreprise(ListeDevis ldevis)
 // Calcule le nombre de precedences pour un travail donne
 int nombrePred(char travaux[], Precedence prec[], int tlog)
 {
+    printf("*-*-* NOMBREPRED *-*-*");
 	int nbPred = 0, i;
 	for (i=0; i<tlog; i++)
 		if (strcmp(travaux, prec[i].travauxSucc)==0)
@@ -140,6 +155,7 @@ int nombrePred(char travaux[], Precedence prec[], int tlog)
 // Retourne une liste des successeurs pour un travail donne
 Liste lstSucc(char travaux[], Precedence prec[], int tlog)
 {
+    printf("*-*-* LSTSUCC *-*-*");
 	Liste succ = newListe();
 	int i;
 	for (i=0; i<tlog; i++)
@@ -153,21 +169,24 @@ Liste lstSucc(char travaux[], Precedence prec[], int tlog)
 // Affiche les details d'un devis
 void displayDevis(Devis d)
 {
-	printf("\n\t");
-	printf("%s\t%s\t%d\t%d\t%d", d.nomE, d.adresse, d.capital, d.duree, d.prix);
+    printf("*-*-* DISPLAYDEVIS *-*-*\n");
+	printf("%s\t%s\t%d\t%d\t%d\n", d.nomE, d.adresse, d.capital, d.duree, d.prix);
 }
 
 // Affiche les details de l'offre et sa liste de devis
 void displayOffre(Offre *o)
 {
-	printf("\n%s", o->travaux);
+    printf("\n*-*-* DISPLAYOFFRE *-*-*\n");
+	printf("\n%s\n\t", o->travaux);
 	displayListeDevis(o->ldevis);
+    printf("\n *-*-* DISPLAYOFFREOUT *-*-*");
 }
 
 // Affiche les details de la liste de devis
 void displayListeDevis(ListeDevis l)
 {
-	while(l)
+    printf("*-*-* DISPLAYLISTEDEVIS *-*-*");
+	while(l != NULL)
 	{
 		displayDevis(l->dev);
 		l=l->suiv;
@@ -177,6 +196,7 @@ void displayListeDevis(ListeDevis l)
 // Fonction pour afficher le devis d'une entreprise donnée pour un type de travaux donné
 void afficherDevisEntreprise(Offre **tabTravaux)
 {
+    printf("*-*-* AFFICHERDEVISENTREPRISE *-*-*");
 	int indiceTravaux;
 	int maxlen;
 	char typeTravaux[30];