From 707fce7b912cf1c7d8879303e195718f977f4b47 Mon Sep 17 00:00:00 2001 From: "antoine.perederii" Date: Wed, 7 Dec 2022 19:44:26 +0100 Subject: [PATCH] ajout final du tp13 d'algo --- Algo/tp/tp13/exe | Bin 17520 -> 21888 bytes Algo/tp/tp13/joresult.don | 8 ++++---- Algo/tp/tp13/paysalpha.don | 12 +++++++----- Algo/tp/tp13/resdujour.don | 6 +++--- Algo/tp/tp13/tp13.c | 25 +++++++++++++++++++------ 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Algo/tp/tp13/exe b/Algo/tp/tp13/exe index 2085f96604d43183aa52732ffcaa19a80dbd1125..e7787b4abb5e03152616a26026483847c94e080b 100755 GIT binary patch literal 21888 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 OX((0C+z*Wn_xvB;mpX|6 diff --git a/Algo/tp/tp13/joresult.don b/Algo/tp/tp13/joresult.don index 6585b0a..395cce4 100644 --- a/Algo/tp/tp13/joresult.don +++ b/Algo/tp/tp13/joresult.don @@ -1,7 +1,7 @@ Etats-Unis 16 20 14 -Chine___ 15 8 7 +Chine 15 8 7 Australie 9 8 8 -Japon___ 3 6 5 +Japon 3 6 5 Allemagne 7 10 15 -France__ 4 6 -Italie__ 5 3 2 +France 4 6 +Italie 5 3 2 diff --git a/Algo/tp/tp13/paysalpha.don b/Algo/tp/tp13/paysalpha.don index bc009ca..484c150 100644 --- a/Algo/tp/tp13/paysalpha.don +++ b/Algo/tp/tp13/paysalpha.don @@ -1,9 +1,11 @@ Allemagne 7 10 16 33 Australie 9 8 8 25 -Chine___ 17 9 7 33 -Cuba____ 1 1 0 2 +Chine 15 8 7 30 +Chine 2 1 0 3 +Cuba 1 1 0 2 Etats-Unis 16 20 14 50 -France__ 5 7 0 12 -Italie__ 5 3 2 10 -Japon___ 3 6 5 14 +France 1 1 0 2 +France 4 6 0 10 +Italie 5 3 2 10 +Japon 3 6 5 14 Zimbabwe 0 0 1 1 diff --git a/Algo/tp/tp13/resdujour.don b/Algo/tp/tp13/resdujour.don index cf7e021..9ffffb4 100644 --- a/Algo/tp/tp13/resdujour.don +++ b/Algo/tp/tp13/resdujour.don @@ -1,5 +1,5 @@ -Chine___ 2 1 0 +Chine 2 1 0 Allemagne 0 0 1 -Cuba____ 1 1 0 -France__ 1 1 0 +Cuba 1 1 0 +France 1 1 0 Zimbabwe 0 0 1 diff --git a/Algo/tp/tp13/tp13.c b/Algo/tp/tp13/tp13.c index 92d8afd..2ea778c 100644 --- a/Algo/tp/tp13/tp13.c +++ b/Algo/tp/tp13/tp13.c @@ -10,7 +10,10 @@ Pays lirePays(FILE *flot) void afficherPays(Pays p) { - printf("%s\t%d\t%d\t%d\t%d\n", p.pays, p.or, p.ar, p.br, p.tot); + if(strlen(p.pays) < 8) + printf("%s\t\t%d\t%d\t%d\t%d\n", p.pays, p.or, p.ar, p.br, p.tot); + else + printf("%s\t%d\t%d\t%d\t%d\n", p.pays, p.or, p.ar, p.br, p.tot); } int chargeResults(Pays *tpays[], int nbmax) @@ -88,12 +91,22 @@ void triEchange(Pays *tpays[], int nb) } } -int copie(Pays *tpays[], int i, int j, int n, Pays *tab2[]) +int copieR(Pays *tpays[], int i, int j, Pays *R[]) { int r, pas = 0; - for(r=i; r<1; r++) + for(r=i; r