From d2f4bece9a1382a15eab41622ba5029030c71e5c Mon Sep 17 00:00:00 2001 From: "yann.champeau" Date: Fri, 13 Jan 2023 15:35:10 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9sactivation=20du=20tri.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/partie3/saeP3.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/partie3/saeP3.c b/src/partie3/saeP3.c index 1c6f803..51ebfb5 100644 --- a/src/partie3/saeP3.c +++ b/src/partie3/saeP3.c @@ -174,7 +174,8 @@ void Admissions(candidat* tcandidat[],int tlogi) } } -int* fusion(int* tabfusion1,int tlogi1, int* tabfusion2, int tlogi2) +//Le tien : +/*int* fusion(int* tabfusion1,int tlogi1, int* tabfusion2, int tlogi2) { int retTab[tlogi1+tlogi2]; int i1=0, i2=0; @@ -221,7 +222,10 @@ int* tri_fusion(int* tabNote, int* tabIDCandidatAttente, int taille) return fusion(tri_fusion(tabNote,tabIDCandidatAttente,taille/2),taille/2,\ tri_fusion(tabNote+taille-taille/2,tabIDCandidatAttente+taille-taille/2,taille-taille/2),taille-taille/2); } -} +}*/ + + +//Le mien : /* int* fusion(tabG,tailleG,tabNoteG,tabD,tailleD,tabNoteD,retNote){ int ret[tailleG+tailleD]