From e9eabf3be2f0777614fd775329f2fe49b9d611de Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 15:09:15 +0100 Subject: [PATCH 01/27] Add helloworld --- martin-remi/helloworld.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 martin-remi/helloworld.py diff --git a/martin-remi/helloworld.py b/martin-remi/helloworld.py new file mode 100644 index 0000000..8e23576 --- /dev/null +++ b/martin-remi/helloworld.py @@ -0,0 +1 @@ +print("Hello World") \ No newline at end of file From 75402a41fb307cc9282bd6065b3ccc375b1ac1d9 Mon Sep 17 00:00:00 2001 From: Martin Lavallee Date: Thu, 30 Nov 2023 15:17:32 +0100 Subject: [PATCH 02/27] Premiere modif test --- martin-remi/helloworld.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/martin-remi/helloworld.py b/martin-remi/helloworld.py index 8e23576..3b40c4a 100644 --- a/martin-remi/helloworld.py +++ b/martin-remi/helloworld.py @@ -1 +1 @@ -print("Hello World") \ No newline at end of file +print("Hello INSA") \ No newline at end of file From 4ea842d32ce13646f5208464771f6a26c856834e Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 15:31:58 +0100 Subject: [PATCH 03/27] Ajout du fichier fonction.py --- martin-remi/fonction.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 martin-remi/fonction.py diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py new file mode 100644 index 0000000..5306281 --- /dev/null +++ b/martin-remi/fonction.py @@ -0,0 +1,26 @@ + + +def addition(x, y): + """Retourne la somme de x et y""" + return + + +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 75ad1db0087f6ca429c989de248650f8a768477b Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 15:41:18 +0100 Subject: [PATCH 04/27] feat(fonction): Ajout de l'addition --- martin-remi/fonction.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index 5306281..bae9698 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -2,7 +2,8 @@ def addition(x, y): """Retourne la somme de x et y""" - return + res = x + y + return res def soustraction(x, y): From a60cd7b031dfa720918914a1f2ea9b774c8d1863 Mon Sep 17 00:00:00 2001 From: Martin-38 Date: Thu, 30 Nov 2023 15:49:19 +0100 Subject: [PATCH 05/27] Ajout de la soustraction --- martin-remi/fonction.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index bae9698..d6fc956 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -2,13 +2,12 @@ def addition(x, y): """Retourne la somme de x et y""" - res = x + y - return res + return def soustraction(x, y): """Retourne la différence de x et y""" - return + return x-y def noms_binome(): From 91fac7d356660319a6bd546510c82fdab8b22301 Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 15:50:46 +0100 Subject: [PATCH 06/27] feat(fonction): Ajout de l'addition --- martin-remi/fonction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index d6fc956..412bbed 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -2,7 +2,7 @@ def addition(x, y): """Retourne la somme de x et y""" - return + return x+y def soustraction(x, y): From 7c93bc06fb906474bd4cf1774f0626acc9e8d2b8 Mon Sep 17 00:00:00 2001 From: Martin-38 Date: Thu, 30 Nov 2023 15:55:51 +0100 Subject: [PATCH 07/27] =?UTF-8?q?Commentaire=20ajout=C3=A9=20=C3=A0=20sous?= =?UTF-8?q?traction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- martin-remi/fonction.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index 412bbed..24aa717 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -7,6 +7,8 @@ def addition(x, y): def soustraction(x, y): """Retourne la différence de x et y""" + #super cette soustraction + return x-y From a84e1092e1689c0f3ce7140538a985052fa0351b Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 15:56:57 +0100 Subject: [PATCH 08/27] Ajout commentaire addition --- martin-remi/fonction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index 24aa717..84234b9 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -1,7 +1,7 @@ def addition(x, y): - """Retourne la somme de x et y""" + """Retourne l'addition de x et y""" return x+y From 6ed1752863195aa6b64d4a070714b6a6c66316ee Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 16:03:23 +0100 Subject: [PATCH 09/27] =?UTF-8?q?Afficher=20R=C3=A9mi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- martin-remi/fonction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index 84234b9..a49bc9a 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -17,7 +17,7 @@ def noms_binome(): Affiche les noms des membres du binôme Attention, chacun écrit la ligne pour afficher son nom """ - + print("Rémi") a = 2 b = 1 From b13cd6682eb845ceaab3aa811dd54d3503329241 Mon Sep 17 00:00:00 2001 From: Martin-38 Date: Thu, 30 Nov 2023 16:14:04 +0100 Subject: [PATCH 10/27] ouptte --- martin-remi/fonction.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/martin-remi/fonction.py b/martin-remi/fonction.py index a49bc9a..f654ab4 100644 --- a/martin-remi/fonction.py +++ b/martin-remi/fonction.py @@ -18,6 +18,8 @@ def noms_binome(): Attention, chacun écrit la ligne pour afficher son nom """ print("Rémi") + print("Martin") + a = 2 b = 1 From d3a36b52c0412ded34bba550ef6103f1080da3ef Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 16:58:09 +0100 Subject: [PATCH 11/27] Modification du fichier NOM.txt --- NOMS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NOMS.txt b/NOMS.txt index b1ec043..8f62811 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -1,3 +1,4 @@ Capucine Rahul Alix Romain -Gaspard Ewan \ No newline at end of file +Gaspard Ewan +Martin Rémi \ No newline at end of file From 76409a86eec856f23fe167eaad49d14ecc91e4bf Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:07:53 +0100 Subject: [PATCH 12/27] premier code la meilleur team --- racine.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 racine.py diff --git a/racine.py b/racine.py new file mode 100644 index 0000000..e1e32df --- /dev/null +++ b/racine.py @@ -0,0 +1,15 @@ +def fibonnaci(n): + if n == 0: + return 0 + elif n == 1: + return 1 + else: + fib = fibonnaci(n-1) + fibonnaci(n-2) + return fib + +def main(argv): + print(fibonnaci(int(argv[1]))) + +if __name__ == "__main__": + main(sys.argv) + \ No newline at end of file From b13e51138a43744432db56a7454841c0a9a6f146 Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:10:48 +0100 Subject: [PATCH 13/27] j'en ai marre --- .racine.py.swp | Bin 0 -> 12288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .racine.py.swp diff --git a/.racine.py.swp b/.racine.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..7045b78eceb3f929b0b4d88fc790788a91650d88 GIT binary patch literal 12288 zcmeI2PiqrF6u@7r2M?x-9=$wMMGfpuOfKrlLQw*(md1!hRHmCrvba05?9Nc*!Fu%` z^(%;e2#;O`j|xKiCG@0k^T()YV~VHnmi(CP?wfh@e#;(0-gfzRZ5=QBWuW6Yz`GY6 zRX=hV-q2~*kxu8=ryOf8m=ZC(En;m&AR3uUGf|hZ47FG_fs2*4nW){UuZU{xns^|c zO;sk^p%u3_yz8O$D&A;oNalR3XN*z;^0+ZE}q7dCmNIc z{EZE;0XDz}*Z><~18jf|uz|TZV3P&dr79Okl`i~coO=;mARAx<~ z18jf|uz@)?Ae#Vt#{j+&`Tzgp-~ajfYvLubOFSX&6ZeQM;tp|^___q}g?LXqCwhcW zoFWbpi$uQw@Oi{18b1=Rh{r^iSSOZ<0`cMK9Lwg?*Z><~18jf|umLu}2G{@__^$>K z@qp_ceC9CWEc0iHrPXH)AMIx_Yyy-@CESRV%oJJ`MHnmG=@{%9hcZ<@z>2dSlVaGU zKJ3tT(dmcU>}crsdi~zhGf0it7??N?EwrSS(G^s2LUH*73ZT#VL96)Qv$tz*dPH!+ zySr~IIKWNHg`U@r%(jfs8qAbM+fkD}8XeIFG+hicOjTmC(3-UC!zh@lOHl@aaoV2C zu&G+oMfS&hsv1Xi=~mdD-gP{Fl6}7QPSfqSc)gu`vk@Cq^5nwa# cogcd&kH0;GncNRm|7v@x%RjW$|NO|{JGU?fZ2$lO literal 0 HcmV?d00001 From be10ba3394de8ab1e4446ff47d2e213f92ad1b45 Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:25:40 +0100 Subject: [PATCH 14/27] fibo ok --- racine.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/racine.py b/racine.py index e1e32df..ac7c373 100644 --- a/racine.py +++ b/racine.py @@ -1,3 +1,5 @@ +import sys + def fibonnaci(n): if n == 0: return 0 @@ -12,4 +14,3 @@ def main(argv): if __name__ == "__main__": main(sys.argv) - \ No newline at end of file From 6a570b00ce84734ef5e33e8588ee4c24c96efcfa Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:27:52 +0100 Subject: [PATCH 15/27] correction directory --- racine.py => samain-sanchez/racine.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename racine.py => samain-sanchez/racine.py (100%) diff --git a/racine.py b/samain-sanchez/racine.py similarity index 100% rename from racine.py rename to samain-sanchez/racine.py From 8e8556f32ef97e72f8a9dc3cfd0f95fb5e1d2420 Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:34:08 +0100 Subject: [PATCH 16/27] fact --- samain-sanchez/racine.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/samain-sanchez/racine.py b/samain-sanchez/racine.py index ac7c373..e242e7c 100644 --- a/samain-sanchez/racine.py +++ b/samain-sanchez/racine.py @@ -1,16 +1,13 @@ import sys -def fibonnaci(n): +def fact(n): if n == 0: - return 0 - elif n == 1: return 1 else: - fib = fibonnaci(n-1) + fibonnaci(n-2) - return fib + return n * fact(n-1) def main(argv): - print(fibonnaci(int(argv[1]))) + print(fact(int(argv[1]))) if __name__ == "__main__": main(sys.argv) From 015c50fdd96bcc4dcc2378f64ff016061e7a6655 Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:36:48 +0100 Subject: [PATCH 17/27] "fonctio.py" --- samain-sanchez/fonctions.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 samain-sanchez/fonctions.py diff --git a/samain-sanchez/fonctions.py b/samain-sanchez/fonctions.py new file mode 100644 index 0000000..5306281 --- /dev/null +++ b/samain-sanchez/fonctions.py @@ -0,0 +1,26 @@ + + +def addition(x, y): + """Retourne la somme de x et y""" + return + + +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 d3cc7bda7205cd86ba05b9503b6464d19ed09cee Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 30 Nov 2023 15:35:56 +0100 Subject: [PATCH 18/27] Gros chien --- samain-sanchez/racine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samain-sanchez/racine.py b/samain-sanchez/racine.py index e242e7c..4b8dcdb 100644 --- a/samain-sanchez/racine.py +++ b/samain-sanchez/racine.py @@ -7,7 +7,7 @@ def fact(n): return n * fact(n-1) def main(argv): - print(fact(int(argv[1]))) + print("Hello INSA") if __name__ == "__main__": main(sys.argv) From 11c574bdcffdb32cbbc0e02af1eb244b93f9f1c1 Mon Sep 17 00:00:00 2001 From: Shaunerie Date: Thu, 30 Nov 2023 15:44:26 +0100 Subject: [PATCH 19/27] addition --- samain-sanchez/fonctions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samain-sanchez/fonctions.py b/samain-sanchez/fonctions.py index 5306281..25d6886 100644 --- a/samain-sanchez/fonctions.py +++ b/samain-sanchez/fonctions.py @@ -2,12 +2,12 @@ def addition(x, y): """Retourne la somme de x et y""" - return + return x + y def soustraction(x, y): """Retourne la différence de x et y""" - return + return def noms_binome(): @@ -15,6 +15,7 @@ def noms_binome(): Affiche les noms des membres du binôme Attention, chacun écrit la ligne pour afficher son nom """ + print("Samain") a = 2 From cec3e1a592b730d269fff117a10542178024897a Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:28:01 +0100 Subject: [PATCH 20/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NOMS.txt b/NOMS.txt index 8f62811..0ab8f78 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -1,4 +1,5 @@ Capucine Rahul Alix Romain Gaspard Ewan -Martin Rémi \ No newline at end of file +Martin Rémi +SAMAIN Luc From 8d75547848e33856434f0dab4eda66dfbafa54d3 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 30 Nov 2023 15:45:25 +0100 Subject: [PATCH 21/27] Soustraction --- samain-sanchez/fonctions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samain-sanchez/fonctions.py b/samain-sanchez/fonctions.py index 25d6886..7ba8809 100644 --- a/samain-sanchez/fonctions.py +++ b/samain-sanchez/fonctions.py @@ -7,7 +7,7 @@ def addition(x, y): def soustraction(x, y): """Retourne la différence de x et y""" - return + return x-y def noms_binome(): @@ -17,6 +17,7 @@ def noms_binome(): """ print("Samain") + print("Sacnhez") a = 2 b = 1 From 577dedaf5c68a46039272584bcfa38bb9e321c2d Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 30 Nov 2023 15:52:13 +0100 Subject: [PATCH 22/27] Mon non gros chien --- NOMS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/NOMS.txt b/NOMS.txt index 0ab8f78..e73267d 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -3,3 +3,4 @@ Alix Romain Gaspard Ewan Martin Rémi SAMAIN Luc +SANCHEZ Lucas \ No newline at end of file From 83996cf49b9323eb5083b81dc5c5d4b187792ff7 Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:27:00 +0100 Subject: [PATCH 23/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOMS.txt b/NOMS.txt index e73267d..c52198b 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -3,4 +3,4 @@ Alix Romain Gaspard Ewan Martin Rémi SAMAIN Luc -SANCHEZ Lucas \ No newline at end of file +SANCHEZ Lucas From 52d50c1bed1d8913ca3b90c39a09a349efc61292 Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:32:26 +0100 Subject: [PATCH 24/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NOMS.txt b/NOMS.txt index c52198b..6774a4b 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -4,3 +4,7 @@ Gaspard Ewan Martin Rémi SAMAIN Luc SANCHEZ Lucas +<<<<<<< HEAD +======= +Martin Rémi +>>>>>>> a45d3c0 (Résolution des conflits) From cdfb8f4ed45efd6a7c0c8b684de24c6542949e6a Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:39:30 +0100 Subject: [PATCH 25/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NOMS.txt b/NOMS.txt index 6774a4b..c52198b 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -4,7 +4,3 @@ Gaspard Ewan Martin Rémi SAMAIN Luc SANCHEZ Lucas -<<<<<<< HEAD -======= -Martin Rémi ->>>>>>> a45d3c0 (Résolution des conflits) From f56bdd656e7117a1a1269b738a2a4d26d40283e8 Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:40:20 +0100 Subject: [PATCH 26/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NOMS.txt b/NOMS.txt index c52198b..e9de897 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -4,3 +4,7 @@ Gaspard Ewan Martin Rémi SAMAIN Luc SANCHEZ Lucas +<<<<<<< HEAD +======= +Martin Rémi +>>>>>>> 74d0d7a (Résolution des conflits) From 4474758b19a0e91c68add81ab668491363d7b58e Mon Sep 17 00:00:00 2001 From: remivCode Date: Thu, 30 Nov 2023 17:41:00 +0100 Subject: [PATCH 27/27] =?UTF-8?q?R=C3=A9solution=20des=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NOMS.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NOMS.txt b/NOMS.txt index e9de897..c52198b 100644 --- a/NOMS.txt +++ b/NOMS.txt @@ -4,7 +4,3 @@ Gaspard Ewan Martin Rémi SAMAIN Luc SANCHEZ Lucas -<<<<<<< HEAD -======= -Martin Rémi ->>>>>>> 74d0d7a (Résolution des conflits)