diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 45df3b6..255566b 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -13,7 +13,7 @@ "state": { "type": "markdown", "state": { - "file": "Algo/Séminaire/Exercices sémaines.md", + "file": "Algo/Séminaire/Chapter 1 - CAML basics.md", "mode": "source", "source": false } @@ -85,7 +85,7 @@ "state": { "type": "backlink", "state": { - "file": "Algo/Séminaire/Exercices sémaines.md", + "file": "Algo/Séminaire/Chapter 1 - CAML basics.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -102,7 +102,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Algo/Séminaire/Exercices sémaines.md", + "file": "Algo/Séminaire/Chapter 1 - CAML basics.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -125,7 +125,7 @@ "state": { "type": "outline", "state": { - "file": "Algo/Séminaire/Exercices sémaines.md" + "file": "Algo/Séminaire/Chapter 1 - CAML basics.md" } } } @@ -146,10 +146,10 @@ "command-palette:Open command palette": false } }, - "active": "c473a791e2b34194", + "active": "13c9bfe482ec2d42", "lastOpenFiles": [ - "Algo/Séminaire/Chapter 3 - Case analysis.md", "Algo/Séminaire/Exercices sémaines.md", + "Algo/Séminaire/Chapter 3 - Case analysis.md", "Algo/Séminaire/Chapter 1 - CAML basics.md", "Algo/Séminaire/Chapter 2 - Functions.md", "Algo/Séminaire/assets/69E2987C-209A-48CD-8964-5A60462966E5.jpg", diff --git a/Algo/Séminaire/Chapter 1 - CAML basics.md b/Algo/Séminaire/Chapter 1 - CAML basics.md index 4564939..c528bf7 100644 --- a/Algo/Séminaire/Chapter 1 - CAML basics.md +++ b/Algo/Séminaire/Chapter 1 - CAML basics.md @@ -11,7 +11,7 @@ It's a simple language to write. - **;;** is the end of the line ```Ocaml -_: int=3 (*That a Caml answer to the previus program*) +_: int=3 (*That a Caml answer to the previous program*) ``` ```Ocaml diff --git a/Algo/Séminaire/Exercices sémaines.md b/Algo/Séminaire/Exercices sémaines.md index b5c42eb..7fa130c 100644 --- a/Algo/Séminaire/Exercices sémaines.md +++ b/Algo/Séminaire/Exercices sémaines.md @@ -81,8 +81,23 @@ if a == b then else false (*logical or*) -if a == b then +if a && b then true -else if a && if !b +else if a && not b then + true +else if not a && b then + true +else + false + +(*logical implication*) +if a && b then + true +else if not a && b then + true +else if not a && not b then + true +else + false ```