From 36d18e7da896f229ec47643588852b72fc85c532 Mon Sep 17 00:00:00 2001
From: Lola CHALMIN <lochalmin@iutclinfa2202l.iut.local>
Date: Wed, 14 Dec 2022 17:20:41 +0100
Subject: [PATCH] news

---
 part1.c  |  62 ++++++++++++++++++++++++++++++++++++++++++-------------
 test     | Bin 17360 -> 17312 bytes
 tpart1.c |   1 -
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/part1.c b/part1.c
index 8cb66e8..50330c1 100644
--- a/part1.c
+++ b/part1.c
@@ -47,33 +47,30 @@ ListDept Insert(ListDept list, MaillonDept *m)//insert globalement
 /*étapes pour le chargement:
 1) pour chaque ville : malloc VilleIUT ->initialisation à NULL de la liste et fscanf la ville 
 2) récup le nb pour faire une boucle
-3) boucle dans laquelle on crée nb maillons en insertion du département dans la liste en triant
+3) boucle dans laquelle on crée nb maillons en inserant département dans la liste en triant
 et on recommence tant que fichier non vide*/
 
 int Chargement(VilleIUT **tV, int tmax, char *nameFile)
 {
 	FILE *f;
-	int i = 0;
+	int i = 0, cpt;
 	f = fopen(nameFile, "r");
 	if (f == NULL){printf("pb ouv file"); return -1;}
 	
 	while (!feof(f))
 	{
-		int cpt;
 		VilleIUT *v;
 		v = (VilleIUT *)malloc(sizeof(VilleIUT));
 		if (v == NULL){printf("pb malloc");exit;}
 		fscanf(f, "%s %d", v->ville, &cpt);
-		printf("**%d**\n", cpt);
+		
 		for (cpt; cpt > 0; cpt--)
 		{	
-			printf("bleu\n");
 			MaillonDept *m;
-			m = (MaillonDept*)malloc(sizeof(MaillonDept));
+			m = (MaillonDept*)malloc(sizeof(MaillonDept));//création du maillon
 			if (m == NULL){printf("pb malloc"); exit;}
-			lireM(f, m);
-			AfficheDpmt(m);
-			v->ldept = Insert(v->ldept, m);			
+			lireM(f, m);//lire le maillon avec la fonction plus haut
+			v->ldept = Insert(v->ldept, m);//insert le maillon à sa bonne place		
 		}
 		tV[i] = v;
 		i++;
@@ -84,25 +81,62 @@ int Chargement(VilleIUT **tV, int tmax, char *nameFile)
 }
 
 
-void AfficheDpmt ( MaillonDept *dpt ){
+void AfficheDpmt ( MaillonDept *dpt )//Affiche un département d'une liste
+{
 	if ( dpt == NULL) return;
 	printf("%s %d %s \n", dpt->departement, dpt->nbP, dpt->respAd);
-	AfficheDpmt(dpt->suiv);}
+	AfficheDpmt(dpt->suiv);
+}
 
 
 
-void afficheIUT (VilleIUT *iut){
+void afficheIUT (VilleIUT *iut)//Affiche un iut avec ses départements
+{
 	printf ("%s \n", iut->ville);
 	AfficheDpmt(iut->ldept);
 }
 
 
 
-void Affichetableau(VilleIUT ** TabIUT, int n ){
+void Affichetableau(VilleIUT ** TabIUT, int n )//Affiche le tableau des iuts avec lerus départements
+{
 	int i;
-
 	for ( i = 0 ; i < n ; i++ )
 		afficheIUT(TabIUT[i]);
 }
+
+
+
+
+
+
+ListDept MaJnbP(VilleIUT **tV, char *ville, char dpt, int newnbP)
+{
+	
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
diff --git a/test b/test
index a96f7a14697126be8c7eeb4d98e9c71b34a5e538..fa5cfbc4fb4aeaa40b8f8a90cd543f635f1369b0 100755
GIT binary patch
delta 2203
zcmZ8ieN0nV6u-A$P(J&xr7egps6!<1C?8gwr7cK!B)UK*IR0=$=Li_bilU;%AVY^8
z=?0#eVYWYTS>lLU0%^99xhcY&OWYPnjMK$T+|bpzMR2;zMSVNB?>>y)ruUrlJLmk)
zz4zUZ$sRh`L;GyPq=`hEPZ7k~pL4=k6Qfu){Z~X|hCwkhK%k;=Oruz1P>t4MZuLPI
z?GaWx72muByXKVn+SZf5?XXR~;IH4;Jb5l}<n!AToe<G1u_R$M#lOPe70pe8Ol>xO
z3%YbxXw=$hHf+*bsgw24hxYoY=G58fx~Rtz?LT7i)D5*d5&C>OIH)u0%aAV%{2Ft@
zj`r=Z2KJDqHv+G<!nkf6y7fXWAsYO#UTGAyCRF)y5Nk_IA|YB5;MmTz79)$^%i|*+
zMTzD1FkIJL?EyhCn|)7vn?W$-QUiDlR(l-JU}Dy*7;Fg=;dO%*wiyzj&#;Zgz#~Hy
zjfcvZ#o=wK!?8z9<DG>fAx(Ws1|hD$s)JK6OTk~I?wQ$|^=m`=<$6M-P~wD+2~R5u
z*>W?VkbB9FHBqPq38avIGZUr%wp*lL{b}?|hsN5C@^rG}0OOwE5-Ccf@g=OTl=B#B
zh14}id3>xq-4vx&!w+~Kpo{Dj>!fbaE~ZMs8|?{FujgkpB6+ebN1CzwRzC$N1y9nl
zBo=Xgl$DHZfPaMdX%OB?SxAq-$&_WZ1umw9i;pElgCcp4WLXMU&Pv_;XG!v*KNx$+
zvmd=m{?`v>c@)XzTQ>=uT9DT1pLd1OCH2-tq|mynQZG`3N){=sO6ofF-`;elh7IF5
ziw#yzW0`5PQ@|1r;?)wB3eR+uBX|ji9_eAD>aC1Oy*?+Fn3fdyy~i@VX|~Y;_`sYU
z7mIm^#*z<a$nd?nD1PHSVL!xK^5eyM`z5HbY)|?Ex5w%4*!-}-k1%1$&Gm0s8}f+D
z2=Uif2QT^Ss)P6a>;1upby6tLiSUbSa~?_Ef5t`@{})bAy<vpD7~c_R7KqNYM4GOB
zz605CvB?ZHIK9go?#c4Uc<eqw`3=fzC}&VUcVCuucpBPKE<t(mK8!o-^|m{*JO~+?
zXEMAPMEpsnw=@-r2JI@E5EDxlBJ>ddpTdJohvw>CNXuHJ`TH)c%34IzpdrgaCD@Zy
zMH|Csv$Er%Mq{!M^CO}j6~@Y16VQAIHA80pE4Xr9s9%8N`CfV%uID?14t@#oi;0Ya
zAbROxs1+S_3$%%M@Ng=v8QKcY+Xry-Kijk<hHQaamzCwYELtP7bfMJ&$6Qr(46dU-
z2_xu9CT0){MY<aNg;qL>y#-ne_tHj~Dzs?rBmlIi%1-!9)H-a9HMr6Ru&L<DRiJv^
zs8GUk`-?<63}=gW)32bkcsEuVDbA*~aHZH`uS-$l5Aw7)T%Hu<G=WfJrAHyBB-{8q
zVoqWsjnGh1k!M0J;N#(3m|2zvXOa3ez6-jLB^d2LWWD`M&R@SkiHv?^RL?PQ^-tWp
zl#i-_)BVEnD;(d?@f(P<@ih84z{TBYMLir}kq#GEnC(k(e+e2JQLjlgx)7+_>hhzP
z&G|ERr*L-_$A>Knu#w{%V9sspM8ky3+u`FV7q|IP)pstJ<6Du8#Xq}ryLge!ya-;L
z(YBA{=^U@(_}d&8X3Pr0zB6k_akf_b33RiWK3gUXQ!A|cAJ7|pqr$Z-TWNT*bW9U|
zcXcME%`oB-1$7gv@&e2ux&?1})>OF&TxIwYbM!E@l(~(g+!}?UGWY!9Q4i5&m@Dg~
zgV5&1_uQngjlq!D4TD}2^}`(E>eewsj;{*0Xq!(oK6%%Nd|1P&WR8Y!VFaEHSGj0x
u^eJE?w3NGz>Z}7WRPLn#xK-{o4)9Gh0ImwRv0$YVAAz<CH?_e~MfU$^^!=d#

delta 2312
zcmZWreN0nV6u-AE&{sYSbfxOn7C)FEeU`6Ew6q0DUo)0~1D#8l;*^!B32qP}i=&Jo
zX*xFW{4t};!V)*PEL(6*7R|B=&IxAzftw+58dEkkCEEhVk4T1g=e~Czo7-*P{oV6B
z=bm%!dH3GekpVh2K!@^-u`D7tuL7igc<o6cl%hzX;j5z1oU91VV5FijrBS3Q2%t2?
zrK8YG2aI(#MYn`t(R`EJezoD#HOrfyyRq$d#4=H|?`ZPHYY^A0GG(GQ#YgeqE6>dY
zyS9Kvz^*gHPHi4t2g6#Cu7(z^ndZp-cDc98{T3KU?MY@$H!%k4b$Rq_S+0Rz-5PCY
z$LsL1?p&>gXo=>DACV>2Q+)PfbY2N!Zfi>?Xy3`X&Sh-^v+IFVNoMDmQBIW1yA{+c
zKth~v_ddzD!$MM#g%?y-#XX7zTX!nBlg+R%IW7I+zt~LJpL~!e!>wdLH9&F7%JiLH
zWe)R`9&Jd8=#ONb>p3P862#odY<&XT>U@-2hZIXfoPP$wmtU5`ze;^K=j$8m29sV&
zB19TYzpG>5{s19insyL!FVnhNrdrT}gmw%nA9k3eNYa<6m-@##ghVXU8e+b`=O`Hl
z-A;Kzc_C~xuGrkqP4$UbtL#y=47u;1igb!iQlGn(4W;m{jx;Ia{t1P6G3Fi*Vs|0w
zA{;lmGx9Q+#l&eAE$)Zg#`kGAyqUd%z6Hm#pQYR3e0H=foF*H^iytKtQn+?r>N_+~
zGW+vzOX1@7qgI*!?P4Nvnw4iZm%`^c%X*wkszFpqk*2sb`22M#f-VNjGZe4NR5$7)
zwb#QJ&|%KftZm5t-i?$VsrXuy&epR;dziOyZ448MkxnBTOr)wwtYo@KQw*c{=cVv8
zt}ecZB_2V09KXtH5~+<#5wA_QQ%qVP^8~}yHcX^1PQ$g=anL{36N2X40>dwVB@+E(
znQzZMhIeyIQ`ap8d<8D$I#M4S)C3A4$@E&rVU)j{WU(;j2=tqZid%<#+v*10a|ML>
zwg$q}zNSF<zOT_2UTl&Ei(^Q?P`CDx)c1!z{@X(In(3Bs#Fn2{Sh#w3VWENS+P9|@
z?6&3X?9k=fja`WN^2ikk*gS;;_Y#Q{_&%l)&m*SaPb6+4HX`cq>NtV83Q_j}zOrpi
z($6IlqmXVt`}BS^BEF2Q!<w4(WNnb9rRd2Dq!#hH2D5gn#&8!5`Oj$VccC!<87e^_
z-%7inE#FUvqNnl;QZ4E^RnH~!$l6|@4l8X0yJH6(g<c#_!AA}corf8R)i}g2J9f@k
zn*yWgp(D^BT4@Llh;zmZ>NTMlkalQWKY^Z{PBU7xI89nT89_9oUnUvI5DYv0D2=0(
zL1J(Rb&VjDh_nvuB_?e)nS_Rt_h=AiO3b*3nGzFZl$Ove@Rgb^UVg9eaKw%S4b~X5
zDP`8-Qjw0qnbL#w5;)5aqR-FD3g|AlTxO+v;7*y@QvZ}PSFOM@9Au-1pTS;UAUs6L
zM)F7y8p>;6cX_TegiIDPU0yY&g1Ky-CX+OBf2wu>TFTAznB0HCddrW@5+k(cC^quz
z#Njm42I5>>o~>xtb4PQWpXK}^&Obn&<rDOBf`b+=yUZ|Jp@S=~Tv`C9D$JG&+)YMJ
z9#L;$bw&-$RG6JxP|NcALA|TF`bEyqn-rp%^FcX+*QM_Xc{#;lk>{#@K8ra2271aO
zmjBgmfJYeN5%9W|+dG`!&UruQk8?g>;SI#a6`!z_ET>V;migaTbe<JKcLTM!7jmNF
zhIX3Oj^9A9zb;T+v!ldO;wX=PSUIkV?%ZUfxL<qSqHz?z1FWftI~Cawek)j0(FU|i
z6h=5Z0+m%RVTwyr&|T$PIy>qanuqbK9y}R7j|iilEC_klFa6z6>vjOfJ))rQs76@u
z_-O!qUQzhxPeixZB~04nWXNRnjMq=`sL*OrP&Y&nDyv<BT8l2|uJ+);I8*HrM)=+u
W1zO`0>NhA(7Qk2I!Z6)61%CrN2QNYZ

diff --git a/tpart1.c b/tpart1.c
index bda1319..3503e29 100644
--- a/tpart1.c
+++ b/tpart1.c
@@ -11,6 +11,5 @@ int main(void)
 	VilleIUT *tV[200];
 	int nb;
 	nb = Chargement(tV, 200, "part1.don");
-	Affichetableau(tV, nb);
 	return 0;
 }