From 8095918788a3a5fbcdb87370ad2fd7a824e19d7d Mon Sep 17 00:00:00 2001
From: "antoine.perederii" <anperederi@etu.uca.fr>
Date: Fri, 6 Jan 2023 14:26:55 +0100
Subject: [PATCH] enfin la bonne structure partie_2 git add .

---
 SAE.h         |   2 +-
 exe           | Bin 27120 -> 27120 bytes
 partie_3.c    |   2 +-
 resultats.txt |  32 +++++++++++++++++++++++++++++---
 structures.c  |   2 +-
 structures.h  |  26 ++++++++++----------------
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/SAE.h b/SAE.h
index d04632b..7b1e09f 100755
--- a/SAE.h
+++ b/SAE.h
@@ -49,7 +49,7 @@ void modificationRespDept(VilleIUT *tiut[], int nb);
 // Partie 3
 
 Departement lireDpt(FILE *flot, ListeDepartement dpt);
-void afficherDept(Departement dpt);
+void afficheDept(Departement dpt);
 Admission lireCandidat(FILE *flot, ListeAdmission la);
 void afficherCandidat(Admission candidat);
 ListeAdmission chargerCandidats(char *ficAdmission, char dptResAdmi[30], ListeAdmission la);
diff --git a/exe b/exe
index 1777354d013e0ad642f1b8dc5a5c7a45dd191e61..379b279d8adc7dfebdb223cb3d7684ebb5f93f03 100755
GIT binary patch
delta 49
zcmV-10M7sL(*f|)0kG5p6wj9nNv*so0T3Es8f-d4fqD@`1+(Y^C^!KCvk^OgD*+L+
Hk!D{5=g<)r

delta 49
zcmV-10M7sL(*f|)0kG5p6i&&P&qXKB82C$=^PN9Ezp?dYm9yvqC^!Kwvk^OgD*+O-
Hk!D{5Y?~G=

diff --git a/partie_3.c b/partie_3.c
index dc47a7d..6d38682 100755
--- a/partie_3.c
+++ b/partie_3.c
@@ -6,7 +6,7 @@ Departement lireDept(FILE *flot, ListeDepartement dpt)
     return dpt;
 }
 
-void afficherDpt(Departement dpt)
+void afficheDept(Departement dpt)
 {
     printf("\t%s\t%d\t%d", dpt.departement, dpt.decisionAdmission, dpt.decisionCandidat);
 }
diff --git a/resultats.txt b/resultats.txt
index 19a82d2..9f16d55 100755
--- a/resultats.txt
+++ b/resultats.txt
@@ -1,6 +1,32 @@
-Numero de candidat	Nom	Prenom	Note de maths	Note de francais	Note d'anglais	Note de specialite	Nombre de choix de candidatures	Ville choisie de la premiere candidature	Departement	Decision du departement	Validation
-1	Miahxdamslwmmkangbxv	uxxfnuveepvapkzcxlmy	19	4	16	3	1	Clermont-Ferrand	Departement2	0	0
-2	Kvpzwegaturyphdzvpof	vjrwrilvmsbrwcjmqbvs	7	6	15	20	2	Clermont-Ferrand	Departement4	0	0	Clermont-Ferrand	Departement3	0	0
+99
+1
+Miahxdamslwmmkangbxv
+uxxfnuveepvapkzcxlmy
+19
+4
+16
+3
+1
+Clermont-Ferrand
+Departement2
+0
+0
+2
+Kvpzwegaturyphdzvpof
+vjrwrilvmsbrwcjmqbvs
+7
+6
+15
+20
+2
+Clermont-Ferrand
+Departement4
+0
+0
+Clermont-Ferrand
+Departement3
+0
+0
 3	Sofwpnwidwrbhymzhjfk	kaljbbdwoqpwzandzqxd	13	6	16	1	5	Clermont-Ferrand	Departement15	0	0	Clermont-Ferrand	Departement16	0	0	Clermont-Ferrand	Departement15	0	0	Clermont-Ferrand	Departement7	0	0	Clermont-Ferrand	Departement17	0	0
 4	Orjsumjnjoypbcoszlzw	rdgtbemabkwrptrncjvs	1	7	15	18	2	Clermont-Ferrand	Departement7	0	0	Clermont-Ferrand	Departement4	0	0
 5	Mwojzcnsbhkkbzozppvt	vyejfqylclufqvmsrmqm	17	18	9	12	1	Clermont-Ferrand	Departement19	0	0
diff --git a/structures.c b/structures.c
index 46dd1d4..b113a78 100755
--- a/structures.c
+++ b/structures.c
@@ -9,7 +9,7 @@ ListeAdmission listenouvAdm(void)
     return la;
 }
 
-ListeAdmission insererEnTeteAdm(ListeAdmission la, Admission candidat)
+ListeAdmission insererEnTeteAdm(ListeAdmission la, int num)
 {
     MaillonAdmission *p;
     p = (MaillonAdmission *)malloc(sizeof(MaillonAdmission));
diff --git a/structures.h b/structures.h
index 0f3cfe0..f829bf8 100644
--- a/structures.h
+++ b/structures.h
@@ -17,34 +17,28 @@ typedef struct
     ListeDept ldept;
 } VilleIUT;
 
-/*  Partie 3    */
+/*  Partie 2    */
 
 typedef struct
 {
+    char ville[30];
     char departement[30];
     int decisionAdmission;
     int decisionCandidat;
-} Departement;
+} Choix;
 
-typedef struct maillonDepartement
+typedef struct maillonChoix
 {
-    Departement v;
-    struct maillonDepartement *suiv;
-} MaillonDepartement, *ListeDepartement;
+    Choix choix;
+    struct maillonChoix *suiv;
+} MaillonChoix, *ListeChoix;
 
 typedef struct
 {
     int num;
     char nom[22];    // 20 caractere + 1 espace + 1 caractere de fin de chaine
     char prenom[22]; // 20 caractere + 1 espace + 1 caractere de fin de chaine
-    int tabMatiere[4];
+    float tabMatiere[4];
     int nbChoix;
-    char ville[30];
-    ListeDepartement ldept;
-} Admission;
-
-typedef struct maillonAdmission
-{
-    Admission v;
-    struct maillonAdmission *suiv;
-} MaillonAdmission, *ListeAdmission;
+    ListeChoix lChoix;
+} MaillonEtudiant;