From 3fc893b3e64652663961c546e775746ac313b34a Mon Sep 17 00:00:00 2001 From: Lola CHALMIN Date: Wed, 14 Dec 2022 16:54:20 +0100 Subject: [PATCH] plouf, bonheur, UNE VERSION QUI MARCHE PART1 --- part1.c | 54 ++++++++++++++++++++++++++++++++++++++--- prout.don => part1.don | 5 ---- part1.h | 9 +++++++ test | Bin 16984 -> 17360 bytes tpart1.c | 47 ++++++----------------------------- 5 files changed, 67 insertions(+), 48 deletions(-) rename prout.don => part1.don (98%) diff --git a/part1.c b/part1.c index 31fa2e1..8cb66e8 100644 --- a/part1.c +++ b/part1.c @@ -5,7 +5,9 @@ void lireM(FILE *f, MaillonDept * m)//lire maillon { - fscanf(f, "%s %d %s", m->departement, &m->nbP, m->respAd); + fscanf(f, "%s %d", m->departement, &m->nbP); + fgets(m->respAd, 31, f); + m->respAd[strlen(m->respAd)-1]='\0'; } @@ -33,7 +35,7 @@ ListDept InsertT(ListDept list, MaillonDept * m)//Insert en tête de la liste } -ListDept Insert(ListDept list, MaillonDept *m) +ListDept Insert(ListDept list, MaillonDept *m)//insert globalement { if (list == NULL){return InsertT(list, m);} if (strcmp(list->departement, m->departement)>0){return InsertT(list, m);} @@ -41,6 +43,7 @@ ListDept Insert(ListDept list, MaillonDept *m) return list; } + /*é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 @@ -50,11 +53,56 @@ et on recommence tant que fichier non vide*/ int Chargement(VilleIUT **tV, int tmax, char *nameFile) { FILE *f; - int cpt, cptbcl; + int i = 0; 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)); + if (m == NULL){printf("pb malloc"); exit;} + lireM(f, m); + AfficheDpmt(m); + v->ldept = Insert(v->ldept, m); + } + tV[i] = v; + i++; + } + return i; + } +void AfficheDpmt ( MaillonDept *dpt ){ + if ( dpt == NULL) return; + printf("%s %d %s \n", dpt->departement, dpt->nbP, dpt->respAd); + AfficheDpmt(dpt->suiv);} + + + +void afficheIUT (VilleIUT *iut){ + printf ("%s \n", iut->ville); + AfficheDpmt(iut->ldept); +} + + + +void Affichetableau(VilleIUT ** TabIUT, int n ){ + int i; + + for ( i = 0 ; i < n ; i++ ) + afficheIUT(TabIUT[i]); +} + + diff --git a/prout.don b/part1.don similarity index 98% rename from prout.don rename to part1.don index 14578de..45776df 100644 --- a/prout.don +++ b/part1.don @@ -10,8 +10,3 @@ Biologie 154 Jean Claude Aurillac 2 Biologie 102 Michèle Robert Bio-Informatique 98 Claude Loeb - - - - - diff --git a/part1.h b/part1.h index 6c9b9df..dd1e45e 100644 --- a/part1.h +++ b/part1.h @@ -17,3 +17,12 @@ typedef struct{ }VilleIUT; typedef MaillonDept * ListDept; + +void lireM(FILE *f, MaillonDept * m);//lire maillon +int Exists(char *st1, char *st2); +ListDept InsertT(ListDept list, MaillonDept * m); +ListDept Insert(ListDept list, MaillonDept *m); +int Chargement(VilleIUT **tV, int tmax, char *nameFile); +void AfficheDpmt ( MaillonDept *dpt ); +void afficheIUT (VilleIUT *iut); +void Affichetableau(VilleIUT ** TabIUT, int n ); diff --git a/test b/test index 7ef8ad36ac4226650b5d856ba24ab65c5938a4fd..a96f7a14697126be8c7eeb4d98e9c71b34a5e538 100755 GIT binary patch literal 17360 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 literal 16984 zcmeHOeQX@X6`%9PiTOGkNWef_mXs9p;fs?(J^;g=?Mv2?lemdZfnt`6@6JAYzO(N3 zzyTFpOc5s&$RAXNR+R!ph45D>qKYU22O|iyg#IG3SA87-HY=3WN-g$3* zrm9r6QgvhPzIng*F>l_^u6J%{ZjN-Vsqy&)7r(ef5VyTSAt5a|aG|b%gv2Uw49?#W zUl;Si&y$#vhZKQSmBE^FTBmV8DA_%vx2!mSX)4y7N~ZH8%_FN;G_N>6n9Bs0%YH9J^E9T`Zs-+P-Ep|D_~5m-_Dp{K z{-djIyyL@_uRKC=Qw-#fbf}O%r=RH2I7qJgb)Oj3*fF5{<1Y>k^hUWGK+4N7Sfd=0 z92uNY0dJZEKWz^Dk~#3jbKrLXH*k0h^{-MqKLc)fmBBB?L2Y=;A^^vWQ$%-2Nq8Iz z%Sz@l{i|17x&CN6A%^pIPUP%ZGA)L)$+VpiiGjF;vZ;6)+WjL@E0Ih`Q^_0RU~!rI zt(+ar+SX7MM#R%qULn?Yb+)xz%Y!RRwdKJJgw@%z-ipPu@quK{j%Rz;x2H1ccu#ao zio6XBWzyQ4rBo{_$}ZGkET}&o88jw*z`8;C!k?T>9!K&kHI_d$c@&MJnDl}BUEi;q zkKyB$VA_MXXxt1bIqNfj;8KOtSfp#lWy*!?N0t;7UHAf42Ay`{2((lVyKox!T=;sD zZyNVp8bhi^z9}zUjF74kPWKa+rjV);&d&@&T0(Rdf^hfqV^xSyg>xSyH3QWQ{3kPDj=f)Jj@Q14_k8n56LyWW&m4QEZnD&bbHQ5>IZNKbx&HJJ zYQztc{NR*>vgCE*=@s?hKFPmKJiQ_woRItr#M7(c!CjJnns|C8Jh(&hS@4PN;AL6% z*UrNJtIfh&=GZ&a-925~Y9EHKx$U@iNm{4i$yxL**nC=ldIw2b3t-G`wYLyieb`=v z?i>lCj_w@gOx2%0N{%Nrh5i*%|AI|K&OTxmrp-McTx#w)>^FVSn){E~3*q2Z?V!$? zO2~HDezf%r*opkoUURJV*U%DX;a&S!bG-F)FvVtcsW^z!v$dar_w}(I(}Ooc*bAG@ z$h>J5ey|%6-5h}F{YMxm6Hn5N)+{_%e4KCqRKJtzV@2Py9kmnG^#mCv zrD5$Y(y({J+_r9^S$JC8zf`<|?Z+m7KUZ8gB+NYbTNYK+Q}E4{FIYF;NJ>neQQRrsKz@RzW&@K5I0q|aRaX8t{TR(`K9d{wwF ze0A8uJuc|UDW9ojPf^)=^;FG3H3QWQR5MV`Ks5u^3{*2v&A|UW1N421%I0V?m&_We zxY0kDNsbt?xRHt)*CkUxD$4Uv8OCS2_)t7;8?mz{ciQ<_Tx`e>P43KQ$R6MSV#!$4 zHZBxPVoT2H7aKA|MlA2fyR(x!)3ea^nXU13I!-=@qV`~p93+GbO=P3#$p;ZJBqjK) zXnG)}Fa%tJ<3?_Ha%X=M9~kY)okkSx%MM;h;cUsuRv1|lJ6bHs8AlsSa;OBCCypvV z;X|44H2+2PEu6lkO@H7xJ3zZXbez4Q*MJU#My4HS3iQ;E9A_SW8F}(!$7uqMeS#?k z=maSJVq$#iIJ-cp&}^TI?}kmnH`3rc?bro%+kFcf2&Xj=MYMG;Ddf=Dw2r8NdsXn~i1iby7~T zy@R70@;;Kc1sd+E=?pa9>5l}AZSx|5raNjo0xh@AHv_B27OV|~t_`dT2U@~`rnZ35 z7HEWiTcA#Uw>=Lr4#JO4HF>L+Y6hwqsAiy=focY-8K`EUnt^Ht{;xB@>kxU}A-@aL z+D0n)2BV5z=!lO)vh>hGPn1&>DXnj$b*fZ&?r^GN1+R0Y_kSuZKXk;&NS?j~qww0r z?sRV8m|dwhs^i? zC3qZ_<42dqTRD!Eww`>F+>g7`sE8jYMl0fh(!Pyy|Mi0J<8mBM3^$_ceyr@~{Qz#M zA1lXiKf{f%{)wgMf?MjxuMGS=D90CxO5@HiP7=KCxm+K2YsihLx?ePkP(^%ZUAo)K zFZd}ngVOyuPkiLeAgV^s!x|9~6P`R{!G*-9JvgO>^!fR!ya=%p6(63SmxmNW?NMpR z;j56JYk`v=eqNInU9X0fV_3=p6oSi3h~G6O;$} zdmE}hoJ0TaIq+Z2fj^`D=k+PY5k8`{>BHRCvY_2ez_*Z9u$2Uen_A9rSWf}3*m?Ky?HjY|GTySjoRH3 ziI@8(?h@b>zt_(?;Kpoq5d*%s0xtTqcFxWx62X2kvn|E4hpc|un3BV$lvu_ZNM*J} zQ&!B*WOG(DKO*`wL&K@K9ghWDDr?XlnWPoXW}{mz{NSG5D)1xtP~3{;hlaMo#Kl?A zw98cOc+N%(L-{nKvaB_m!s{beWJ8CAO)=%#F=2IFu_3&^v%Op*cjN%V)+sAuY7b_| zCSk4Z+SnHEvNo<+vpLdZ^@Q8HBIH%>QFb`+DS-p)$mZ z<6A-$0@^rKCP^i;@pk>OLGLmulh4{!R3?@Ck;)MA*FQLdUQml_{}7n+%|uo#m$3%X zDs43C+z2h~akBEcI8r#%d%6_hx8!o#joj2!zDKIm_DX1C0~22v+SycbyHfe4sggOR zO$2jWhwSJUP&=#WAlI<_DxMt{!F0xs2M5ym;Ff$6`{|M~4Tak}o9*a;kg~yOZcqec zThs8TsGU`k>*Cp5GLtT2EXcC)RFn*KZ8&9%pzMAS)!;w|tQ{Z0nMN{{GV*c;1xH~G{m;WY4^BX*J@V`bCejjDZ z^BXOex?CsvO&m0*V0(UVWqKwlxe7lQ8Crpg+n(QVnHsF9sn@;(_}?(c;P&}Fm}!%? z<9Qg*ci8O)RPbN66hFT&Gc_nVC^UVdD%do!*do|O?AafV(t^{3;8qJ~D zp5MQjayuM9>oNU4>}gKMJin(iZP6`xJ0MG#B;S-wBLzqNk_yPfit0$;Ms0*S`Rv+uqQ2Os{bpqwaAp?)KP^Y6YeoFS}u$ z>CZj({C}J29#6pBKKuKH$DZdeOnE-e`W|;;r?%(oCk(Br=~B;tj(JHC$hz?M|lp67K3mI6d+QlxZdd#3L};suiv);} - - - -void afficheIUT (VilleIUT *iut){ - printf ("%s ", iut->ville); - AfficheDpmt(iut->ldept); +int main(void) +{ + VilleIUT *tV[200]; + int nb; + nb = Chargement(tV, 200, "part1.don"); + Affichetableau(tV, nb); + return 0; } - - - -void Affichetableau(VilleIUT * TabIUT, int n ){ - int i; - - for ( i = 0 ; i < n ; i++ ) - afficheIUT(TabIUT[i]); -} \ No newline at end of file