diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 843df83..89206f3 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -10,25 +10,16 @@ { "id": "9f9ffb40dcd212ab", "type": "leaf", - "state": { - "type": "empty", - "state": {} - } - }, - { - "id": "753ff8810fce3fd0", - "type": "leaf", "state": { "type": "markdown", "state": { - "file": "Prog/Array.md", + "file": "Algo/B2/Exercises/Repetitive tutorial.md", "mode": "source", "source": false } } } - ], - "currentTab": 1 + ] } ], "direction": "vertical" @@ -94,7 +85,7 @@ "state": { "type": "backlink", "state": { - "file": "Prog/Array.md", + "file": "Algo/B2/Exercises/Repetitive tutorial.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -111,7 +102,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Prog/Array.md", + "file": "Algo/B2/Exercises/Repetitive tutorial.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -134,7 +125,7 @@ "state": { "type": "outline", "state": { - "file": "Prog/Array.md" + "file": "Algo/B2/Exercises/Repetitive tutorial.md" } } }, @@ -165,9 +156,10 @@ "command-palette:Open command palette": false } }, - "active": "753ff8810fce3fd0", + "active": "9f9ffb40dcd212ab", "lastOpenFiles": [ "Algo/B2/Exercises/Imperative exercise.md", + "Algo/B2/Exercises/Repetitive tutorial.md", "Prog/Array.md", "Algo/B2/Exercises", "Algo/B2", @@ -201,7 +193,6 @@ "Architecture/Ressources.md", "Architecture", "English", - "README.md", "COM-ADMR", "Algo/B1/Séminaire/assets/exception-meme.png", "Algo/B1/Séminaire/assets/filter-meme.png", diff --git a/Algo/B2/Exercises/Imperative exercise.md b/Algo/B2/Exercises/Imperative exercise.md index 161112a..9b92b25 100644 --- a/Algo/B2/Exercises/Imperative exercise.md +++ b/Algo/B2/Exercises/Imperative exercise.md @@ -41,6 +41,26 @@ def max3 (x: int, y: int, z: int) -> int: return m +def max3(x: int, y: int, z: int) -> int: + """ + Function that return the max of 3 numbers + ::params: + x: int -> The first value + y: int -> The second value + z: int -> The third value + ::returns: + The value of the biggest value + """ + if x > y: + m = x + else: + m = y + if m > z: + return m + else: + return z + + def main(): print("Give a 3-digit number") n = int(input()) diff --git a/Algo/B2/Exercises/Repetitive tutorial.md b/Algo/B2/Exercises/Repetitive tutorial.md new file mode 100644 index 0000000..89a384a --- /dev/null +++ b/Algo/B2/Exercises/Repetitive tutorial.md @@ -0,0 +1,46 @@ +## Exercise 1.1 +```python +def zorglub(n: int) -> int: + j = 1 + k = 0 + i = 1 + while i <= n: + j = i * j + k = j + k + i = i + 1 + return k +``` + +The function return the sum of the factorial of n + +## Exercise 1.2 +``` +def multiplication(x: int, y: int) -> int: + result = 0 + for i in range(y): + result = result + x + return result + +def multiplication2(x: int, y: int) -> int: + result = 0 + if x < 0 and y < 0: + i = 0 + x = -x + y = -y + while i < y: + result = result + x + i += 1 + return result + elif y < 0: + y = -y + i = 0 + while i < y: + result = result + x + i += 1 + return -result + else: + i = 0 + while i < y: + result = result + x + i += 1 + return result