From f2c41d1c325bb8a8852eaf16e79751ba3fc11a52 Mon Sep 17 00:00:00 2001 From: Khena BRUNEAU Date: Fri, 16 Dec 2022 09:58:52 +0100 Subject: [PATCH] maj de la partie 2 --- Partie_2/exe | Bin 0 -> 17048 bytes Partie_2/partie2.c | 49 +++++++++++++++++++++++++++++++++++-------- Partie_2/prototype.h | 15 ++++++++----- Partie_2/test.c | 3 +++ 4 files changed, 53 insertions(+), 14 deletions(-) create mode 100755 Partie_2/exe diff --git a/Partie_2/exe b/Partie_2/exe new file mode 100755 index 0000000000000000000000000000000000000000..5331f408a7abc42fa046f3970edaf4123b804d79 GIT binary patch literal 17048 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%0DS zv&eK9r*mS_1~du3y_*2T=-3h3 z)^4Vtrr0AQjJDgihqiUL7Hi}oA5b`MWwh(61ifvCFt&Ex+!E?CZtm#V+1_LH zgj%}VsZ@D1s6UgHZU4-JKXlM2$mfOVl+d171jm7*k+2z72at-?aXLGcOl9|QEprEu zitG?M-`g$JYZ09HXEPf8g$9K}OKr>06C zg(^OfRaAiRXZ9w{a39c2TR6lyoau_DhlQVB$M^@6S$`ki^F-=m5k-YsI_u2vppd$u zaArvOBYTr5&q6b8Y4$|Z8S1z+Q-T3qIvNj?gUSuZP2rc3^dsvZOhGiGBlt_x8b&EO z(*Ed>n#e;D6vC3_YRzcNgY&2%oQUE8zaA6TPs z{rnuw$o2E%FRz!l*zL&BcNqKg^EP881qX@Gzp+2BuXaI4Ya{mO=W<3~7g8CNRB@Jo zzjxxIH5mKz^E=~eWy$SlJH~sUr!^hRh39fKh~nSc*Vh67 literal 0 HcmV?d00001 diff --git a/Partie_2/partie2.c b/Partie_2/partie2.c index 4704e2c..fc7a2d7 100644 --- a/Partie_2/partie2.c +++ b/Partie_2/partie2.c @@ -1,19 +1,50 @@ #include "prototype.h" -Liste inscription(Liste lCand, int nbInsc) +Liste listenouv(void) { - Candidat c; - printf("Veuillez rentrer votre nom et prénom : "); - scanf("%s%*c%s", c.nom, c.prenom); - printf("Entrez les notes : "); - scanf("%f %f %f %f", c.lNote[0], c.lNote[1], c.lNote[2], c.lNote[3]); - c.nbChoix=0; - c.lChoix=NULL; - c.numC=nbInsc + 1 + return NULL; +} + +bool vide(Liste l) +{ + return l==NULL; +} + +Liste inserer(Liste l, Candidat *can) +{ + Maillon *m; + m=(Maillon*)malloc(sizeof(Maillon)); + if (vide(m)) + { + printf("Pb malloc\n"); + exit(1); + } + m->c=can; + m->suiv=l; + m->h=m->h+1; + return m; } void affichage(Liste l) +/*affiche la liste des candidats*/ { printf("Numéro \t Prénom \t Nom \t Notes \t Nombre voeux \t Voeux\n"); +} + +Liste inscription(Liste lCand, int nbInsc) +/* inscript un candidat en rentrant toutes ses informations*/ +{ + Candidat *c; + printf("Veuillez rentrer votre prénom : "); + scanf("%s", c->prenom); + printf("Veuillez rentrer votre nom : "); + scanf("%*c%s", c->nom); + printf("Entrez les notes : "); + scanf("%f %f %f %f", &c->lNote[0], &c->lNote[1], &c->lNote[2], &c->lNote[3]); + c->nbChoix=0; + c->lChoix=NULL; + c->numC=nbInsc + 1; + lCand=inserer(lCand, c); + return lCand; } \ No newline at end of file diff --git a/Partie_2/prototype.h b/Partie_2/prototype.h index 43bdb82..dcb3c0d 100644 --- a/Partie_2/prototype.h +++ b/Partie_2/prototype.h @@ -10,7 +10,7 @@ typedef struct char nom[20]; float lNote[4]; int nbChoix; - struct Choix lChoix[nbChoix]; + struct Choix *lChoix; } Candidat; typedef struct @@ -23,14 +23,19 @@ typedef struct typedef struct maillon { - struct Candidat c; + Candidat *c; struct maillon *suiv; + int h; } Maillon, *Liste; +/*Implémentation liste*/ +Liste listenouv(void); +void affichage(Liste l); +void global(void); + +/*Reste*/ Liste inscription(Liste lCand, int nbInsc); Liste candidater(Liste lCand, Candidat c); Liste modifier(Liste lCand, Candidat c); Liste supprimer(Liste lCand, Candidat c); -void sauvegarder(Liste l); -void affichage(Liste l); -void global(void); \ No newline at end of file +void sauvegarder(Liste l); \ No newline at end of file diff --git a/Partie_2/test.c b/Partie_2/test.c index fc96c09..bf459b8 100644 --- a/Partie_2/test.c +++ b/Partie_2/test.c @@ -4,10 +4,13 @@ void testInsc(void) { Liste l; int nb=0; + l=listenouv(); l=inscription(l, nb); + affichage(l); } int main(void) { + testInsc(); return 1; } \ No newline at end of file