diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 08af3a0..45df3b6 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -146,7 +146,7 @@ "command-palette:Open command palette": false } }, - "active": "13c9bfe482ec2d42", + "active": "c473a791e2b34194", "lastOpenFiles": [ "Algo/Séminaire/Chapter 3 - Case analysis.md", "Algo/Séminaire/Exercices sémaines.md", diff --git a/Algo/Séminaire/Exercices sémaines.md b/Algo/Séminaire/Exercices sémaines.md index 718be53..7235cb3 100644 --- a/Algo/Séminaire/Exercices sémaines.md +++ b/Algo/Séminaire/Exercices sémaines.md @@ -61,3 +61,20 @@ let add_times h1 m1 s1 h2 m2 s2 = let sec1 = sec_of_time h1 m1 s1 and sec2 = sec_of_time h2 m2 s2 in let resultsec = sec1 + sec2 in time_of_sec resultsec ;; ``` + +## Exercise 3.1 +```Ocaml +let f a b c = + (if a > b && if b > c then + a + b else c + a + else if a > c then a + b else b + c)* + (if a > b && b > c then + a - b else a - c + else if a > c then a-b else b-c);; +``` + +### Exercise 3.2 +```OCaml +if a && b then + true +else false