From e779423edc0f44ccbe2a418baed2746cf1d36f1b Mon Sep 17 00:00:00 2001 From: equisarque Date: Thu, 30 Nov 2023 15:16:43 +0100 Subject: [PATCH 1/6] feat/hello --- CottonCutie-equisarque/test.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 CottonCutie-equisarque/test.py diff --git a/CottonCutie-equisarque/test.py b/CottonCutie-equisarque/test.py new file mode 100644 index 0000000..fd9fe23 --- /dev/null +++ b/CottonCutie-equisarque/test.py @@ -0,0 +1 @@ +print("Juliette est la meilleur") \ No newline at end of file From 8425f6e23d1fd32fb5ee97bf187c6ebd0759dcee Mon Sep 17 00:00:00 2001 From: CottonCutie Date: Thu, 30 Nov 2023 15:32:02 +0100 Subject: [PATCH 2/6] fix/Youpi:fire: --- CottonCutie-equisarque/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CottonCutie-equisarque/test.py b/CottonCutie-equisarque/test.py index fd9fe23..1046a56 100644 --- a/CottonCutie-equisarque/test.py +++ b/CottonCutie-equisarque/test.py @@ -1 +1 @@ -print("Juliette est la meilleur") \ No newline at end of file +print("Guillaume est le meilleure") \ No newline at end of file From a0b3ad80b87a8cc9302bf55453fddd1d58098444 Mon Sep 17 00:00:00 2001 From: equisarque Date: Thu, 30 Nov 2023 15:39:53 +0100 Subject: [PATCH 3/6] addition --- CottonCutie-equisarque/fct.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 CottonCutie-equisarque/fct.py diff --git a/CottonCutie-equisarque/fct.py b/CottonCutie-equisarque/fct.py new file mode 100644 index 0000000..6755031 --- /dev/null +++ b/CottonCutie-equisarque/fct.py @@ -0,0 +1,26 @@ + + +def addition(x, y): + a = x+y + return a + + +def soustraction(x, y): + """Retourne la différence de x et y""" + return + + +def noms_binome(): + """ + Affiche les noms des membres du binôme + Attention, chacun écrit la ligne pour afficher son nom + """ + + +a = 2 +b = 1 + +print(f"La somme de {a} et {b} vaut {addition(a, b)}") +print(f"La différence de {a} et {b} vaut {soustraction(a, b)}") + +noms_binome() From f9afa2cf75399b743810a917a3af65ff12fe37cc Mon Sep 17 00:00:00 2001 From: CottonCutie Date: Thu, 30 Nov 2023 15:42:53 +0100 Subject: [PATCH 4/6] feat/SOUSTRACTIONNNNNN --- CottonCutie-equisarque/fct.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CottonCutie-equisarque/fct.py b/CottonCutie-equisarque/fct.py index 6755031..2a11198 100644 --- a/CottonCutie-equisarque/fct.py +++ b/CottonCutie-equisarque/fct.py @@ -4,10 +4,9 @@ def addition(x, y): a = x+y return a - def soustraction(x, y): """Retourne la différence de x et y""" - return + return x-y def noms_binome(): @@ -24,3 +23,4 @@ def noms_binome(): print(f"La différence de {a} et {b} vaut {soustraction(a, b)}") noms_binome() + From 01ef2183960d1a3e74fd66a1fc25ffa027bc41ae Mon Sep 17 00:00:00 2001 From: CottonCutie Date: Thu, 30 Nov 2023 15:55:46 +0100 Subject: [PATCH 5/6] feat/Fonction binome UwU --- CottonCutie-equisarque/fct.py | 1 + 1 file changed, 1 insertion(+) diff --git a/CottonCutie-equisarque/fct.py b/CottonCutie-equisarque/fct.py index 2a11198..719a833 100644 --- a/CottonCutie-equisarque/fct.py +++ b/CottonCutie-equisarque/fct.py @@ -14,6 +14,7 @@ def noms_binome(): Affiche les noms des membres du binôme Attention, chacun écrit la ligne pour afficher son nom """ + print("Cottonneuuuh") a = 2 From 42072ad750a2bcc4618116aa9a3e8fe0f7853ff1 Mon Sep 17 00:00:00 2001 From: equisarque Date: Thu, 30 Nov 2023 15:56:42 +0100 Subject: [PATCH 6/6] feat/equisarque --- CottonCutie-equisarque/fct.py | 1 + 1 file changed, 1 insertion(+) diff --git a/CottonCutie-equisarque/fct.py b/CottonCutie-equisarque/fct.py index 719a833..8d0a466 100644 --- a/CottonCutie-equisarque/fct.py +++ b/CottonCutie-equisarque/fct.py @@ -15,6 +15,7 @@ def noms_binome(): Attention, chacun écrit la ligne pour afficher son nom """ print("Cottonneuuuh") + print("equisarque") a = 2