From c137d638a7f39ba1a67579930b43e19f979f2abb Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 7 Sep 2023 14:42:16 +0200 Subject: [PATCH] vault backup: 2023-09-07 14:42:16 --- .obsidian/appearance.json | 3 ++- Algo/Séminaire/Exercices sémaines.md | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json index c8c365d..2680ec9 100644 --- a/.obsidian/appearance.json +++ b/.obsidian/appearance.json @@ -1,3 +1,4 @@ { - "accentColor": "" + "accentColor": "", + "baseFontSize": 18 } \ No newline at end of file diff --git a/Algo/Séminaire/Exercices sémaines.md b/Algo/Séminaire/Exercices sémaines.md index 095b3a6..2dddde8 100644 --- a/Algo/Séminaire/Exercices sémaines.md +++ b/Algo/Séminaire/Exercices sémaines.md @@ -64,6 +64,12 @@ let add_times h1 m1 s1 h2 m2 s2 = ## Exercise 3.1 ```Ocaml +let add a b = + if a > b then + a-b + a/b + else + b-a + b/a + let f a b c = (if a > b && if b > c then a + b else c + a