From 5173e74421bd2c3bd9985d2b0c5aac865e95ca18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20LACROIX?= Date: Sat, 14 Jan 2023 15:42:54 +0100 Subject: [PATCH] polished readme (typo + clarification of examples) --- README.md | 17 +- _build/_digests | 24 +- outFileApp | 60 ++-- outFileApp.svg | 724 +++++++++++++++++++++++------------------------- 4 files changed, 408 insertions(+), 417 deletions(-) diff --git a/README.md b/README.md index bab8b7a..b0eb348 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -*Projet réalisé par Raphaël LACROIX et Aurélia LEJEUNE* +*Project undertaken by Aurélia LEJEUNE and Raphaël LACROIX as part of our 4th year course on functionnal programming* # What is this project about? Ever needed to organise an day with participants (like children for instance) that can pick a variying number of @@ -30,6 +30,19 @@ Participant_2 id_1 id_2 id_3 ... id_n ... Participant_m id_1 id_2 id_3 ... id_n ``` +So it may look like : +``` +Foot 15 +Hockey 12 +Piscine 15 +Poney-aquatique 2 + +Jean 1 2 +Jean-Michel 5 +Jean-Claude 1 +Jean-ti 1 6 2 +``` + The formatting is the same should you input the information through the terminal. You will be guided along the way. ## Examples ### with a source file @@ -49,7 +62,7 @@ The formatting is the same should you input the information through the terminal - The user is **NOT ASKED** - the order of interest among the choices for a **children/students** - the answer to the question of life, the universe and everything -- `make test` enables you to test the first step of the project +- `make test` enables you to test the first step of the project (i.e. just running the Ford-Fulkerson algorithm on a test graph) - ⚠️ But it is needed to roll back in the git history before the changes for the "Medium" part were made like [this one](https://git.etud.insa-toulouse.fr/rlacroix/FordFulkersonLeChameau/src/commit/5ca008700e62474cc17b2845e7d2dd061c319861) - An image of the final graph (`./outFileApp.svg`) can be used to get a better understanding of the algorithm here is an example : diff --git a/_build/_digests b/_build/_digests index b17f04b..52fd637 100644 --- a/_build/_digests +++ b/_build/_digests @@ -1,24 +1,24 @@ "Rule: ocaml dependencies ml (%=src/appTools )": "\251=\168`u\209\146f\001\158_z\160\248?\004" -"Rule: ocaml dependencies mli (%=src/gfile )": "7\182\192g\020\238\188\b\211\164{\014\157\135\011\003" "Rule: ocaml: ml & cmi -> cmx & o (%=src/display )": "r\205l\0020\228\241/A\1640\245\127F)-" +"Rule: ocaml dependencies mli (%=src/gfile )": "7\182\192g\020\238\188\b\211\164{\014\157\135\011\003" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/appTools.mli": "\155\b\026hx\155\244]\204\252\142\180\149\139\198\233" -"Rule: ocaml dependencies mli (%=src/ioApp )": "\199}\132Z\031\020^\201\179,\223C\220\169\194\238" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/appTools.ml": "\004^\138\189Yz\011d\149\188\227\183\236\162\167\026" -"Rule: ocaml: ml & cmi -> cmx & o (%=src/gfile )": "\236O\148Y\157m\028\183\166?\231a\231\187u\132" +"Rule: ocaml dependencies mli (%=src/ioApp )": "\199}\132Z\031\020^\201\179,\223C\220\169\194\238" "Rule: ocaml dependencies ml (%=src/ftest )": "\230\175qh\130\015\155\249vP\209\027\168Q\212\153" -"Rule: ocaml: cmx* & o* -> native (%=src/appMedium )": ".fp\"(\162\159qP\135\211,A/\238\023" +"Rule: ocaml: ml & cmi -> cmx & o (%=src/gfile )": "\236O\148Y\157m\028\183\166?\231a\231\187u\132" "Rule: ocaml dependencies mli (%=src/display )": "\231~k=1\249%\182S0\233D\212\252\223\161" +"Rule: ocaml: cmx* & o* -> native (%=src/appMedium )": ".fp\"(\162\159qP\135\211,A/\238\023" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ftest.ml": "\161\017\169<\253\134ph\188\179@\248\183\026\133'" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/fordFulkerson.ml": "\018\182\220EC\195\028\nc\215W\207\1876\250\179" -"Rule: ocaml: mli -> cmi (%=src/graph )": ")2\159\205\136\031\251\145\0263\01878\001\b\134" "Rule: ocaml: mli -> cmi (%=src/display )": "\165\163&C\247\02392\222\141}\166\237\209\226\196" +"Rule: ocaml: mli -> cmi (%=src/graph )": ")2\159\205\136\031\251\145\0263\01878\001\b\134" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/graph.mli": "\253S\031\015\162|\210x\252\n \227\001{\133e" -"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/tools.ml": "\143\\\1796g(\028m\247\209\131_vDeU" "Rule: ocaml: ml & cmi -> cmx & o (%=src/fordFulkerson )": "\214\1900\020\186\000\135\167\217\223AVA\252\025\025" -"Rule: ocaml: mli -> cmi (%=src/tools )": "\239.\206\1667\139\246~\227$\235l\012\210\208;" +"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/tools.ml": "\143\\\1796g(\028m\247\209\131_vDeU" "Rule: ocaml: cmx* & o* -> native (%=src/ftest )": "\190\0032\195\017x\223\240\255\182\150'\181\147\138\218" -"Rule: ocaml: mli -> cmi (%=src/fordFulkerson )": "v\184\208\237V\182T\138\168\207\20258\221\233s" +"Rule: ocaml: mli -> cmi (%=src/tools )": "\239.\206\1667\139\246~\227$\235l\012\210\208;" "Rule: ocaml: ml & cmi -> cmx & o (%=src/ftest )": "\146\202\182\254\187\193y\243ifv\190\182$y\160" +"Rule: ocaml: mli -> cmi (%=src/fordFulkerson )": "v\184\208\237V\182T\138\168\207\20258\221\233s" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/graph.ml": "\005\175.\2458\176E\202]\255\235=9\015\000\237" "Rule: ocaml: mli -> cmi (%=src/gfile )": "\015\211&r\030l{}\183\187\236\2266\022\129\191" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ioApp.mli": "\178\247\139\175\031\167d)\137\166*\002\145\219/\223" @@ -29,24 +29,24 @@ "Rule: ocaml dependencies ml (%=src/ioApp )": "Q\141\214\1743\1991O\249\139\214\015r/\r\185" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ioApp.ml": "\193&\188\138Q/\209+%\222\025\159X~\205\155" "Rule: ocaml: ml -> cmo & cmi (%=src/ftest )": "\2035PN<\216\182\028\220+~\028\012{V\007" -"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/fordFulkerson.mli": "_;(\155\176\"\225\011\230\191\031M\168\250\219\170" "Rule: ocaml dependencies mli (%=src/fordFulkerson )": "\022\200\166Dz0\003\233z\198y\144S\162\2034" +"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/fordFulkerson.mli": "_;(\155\176\"\225\011\230\191\031M\168\250\219\170" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/display.mli": "\1933\002\200+\198\166\181\251\020[Kl\1395\244" "Rule: ocaml: ml & cmi -> cmx & o (%=src/tools )": "@\029k\227\011N\245M\025S\161\203\212\156\191F" "Rule: ocaml dependencies mli (%=src/appTools )": "\190\231\005\208\005\148\218\\\00486\211\183+i?" "Rule: ocaml: ml -> cmo & cmi (%=src/appMedium )": "v\154\018A\0148\179V\185_\238\255*\202:\153" -"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/gfile.ml": "\1966\177\141\185,fpl\1987gT\128b\028" "Rule: ocaml dependencies ml (%=src/fordFulkerson )": "{V\027D\r\028\012\251;\0033@\020;)P" +"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/gfile.ml": "\1966\177\141\185,fpl\1987gT\128b\028" "Rule: ocaml: ml & cmi -> cmx & o (%=src/appTools )": "\130\144:A,\158^^\248\134@GT\223Qt" "Rule: ocaml dependencies ml (%=src/appMedium )": "\148\253\025j\198\175\211\152si\247\179\246DH\237" "Rule: ocaml: ml & cmi -> cmx & o (%=src/ioApp )": "n\163<(Z)z\002J\248;\031#X\215\156" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/tools.mli": "\025v\144\241\237\241\b\248\197tD\012\171\216\202\148" "Rule: ocaml: ml & cmi -> cmx & o (%=src/graph )": "\190\tV\232\254i\031+\141\154\168\219\155n\156C" "Rule: ocaml dependencies ml (%=src/graph )": "\137kk#\140\236\011\255?\132T\225M\018\169\224" -"Rule: ocaml dependencies mli (%=src/graph )": "\012\213_n\023=\207kZ+\251(^M\2028" "Rule: ocaml dependencies ml (%=src/display )": "\019\144\250c\152\133\228`\149{\127O\bO\247\228" +"Rule: ocaml dependencies mli (%=src/graph )": "\012\213_n\023=\207kZ+\251(^M\2028" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/gfile.mli": "\203\249\163Ct\234\0067d}\142\011m8T`" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/appMedium.ml": "\1337\206,5\244\190\164\238?;3\193\130\164h" -"Rule: ocaml dependencies mli (%=src/tools )": "\151\181\0055\199\150&\017\021_\215\015\215\018\027+" "Rule: ocaml dependencies ml (%=src/gfile )": "U4(<\t=rQ\240c\0278\231N\1949" +"Rule: ocaml dependencies mli (%=src/tools )": "\151\181\0055\199\150&\017\021_\215\015\215\018\027+" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/display.ml": "\224\210\251\012D^\154\134g\244\219\134\016\135\015j" diff --git a/outFileApp b/outFileApp index 1025836..c7ad1e3 100644 --- a/outFileApp +++ b/outFileApp @@ -12,51 +12,49 @@ node [shape = circle]; - 15 -> 3 [label = "1"]; - 15 -> 1 [label = "1"]; - 15 -> 19 [label = "1"]; - 3 -> 12 [label = "1"]; - 3 -> 13 [label = "1"]; - 3 -> 0 [label = "13"]; - 12 -> 19 [label = "1"]; + 10 -> 18 [label = "1"]; + 12 -> 18 [label = "1"]; 6 -> 0 [label = "49"]; 6 -> 11 [label = "1"]; - 11 -> 19 [label = "1"]; + 11 -> 18 [label = "1"]; 11 -> 2 [label = "1"]; 11 -> 1 [label = "1"]; 5 -> 0 [label = "19"]; 5 -> 9 [label = "1"]; - 9 -> 19 [label = "1"]; - 14 -> 7 [label = "1"]; - 18 -> 19 [label = "1"]; - 7 -> 18 [label = "1"]; + 9 -> 18 [label = "1"]; 17 -> 6 [label = "1"]; 17 -> 5 [label = "1"]; - 17 -> 19 [label = "1"]; + 17 -> 18 [label = "1"]; 4 -> 17 [label = "1"]; 4 -> 0 [label = "1"]; - 10 -> 19 [label = "1"]; - 13 -> 2 [label = "1"]; - 13 -> 1 [label = "1"]; - 13 -> 19 [label = "1"]; - 19 -> 14 [label = "1"]; + 15 -> 3 [label = "1"]; + 15 -> 2 [label = "1"]; + 15 -> 18 [label = "1"]; + 14 -> 18 [label = "1"]; + 7 -> 14 [label = "1"]; + 8 -> 1 [label = "1"]; + 8 -> 18 [label = "1"]; + 2 -> 0 [label = "11"]; + 2 -> 8 [label = "1"]; 16 -> 5 [label = "1"]; 16 -> 4 [label = "1"]; - 16 -> 3 [label = "1"]; - 16 -> 19 [label = "1"]; - 2 -> 0 [label = "10"]; - 2 -> 15 [label = "1"]; - 2 -> 16 [label = "1"]; - 8 -> 19 [label = "1"]; - 8 -> 2 [label = "1"]; + 16 -> 18 [label = "1"]; + 16 -> 2 [label = "1"]; + 3 -> 0 [label = "13"]; + 3 -> 12 [label = "1"]; + 3 -> 16 [label = "1"]; + 13 -> 18 [label = "1"]; + 13 -> 2 [label = "1"]; + 13 -> 3 [label = "1"]; 1 -> 10 [label = "1"]; - 1 -> 8 [label = "1"]; - 1 -> 0 [label = "13"]; - 0 -> 2 [label = "2"]; + 1 -> 15 [label = "1"]; + 1 -> 13 [label = "1"]; + 1 -> 0 [label = "12"]; + 0 -> 3 [label = "2"]; 0 -> 6 [label = "1"]; 0 -> 5 [label = "1"]; - 0 -> 7 [label = "1"]; + 0 -> 2 [label = "1"]; 0 -> 4 [label = "1"]; - 0 -> 3 [label = "2"]; - 0 -> 1 [label = "2"]; + 0 -> 7 [label = "1"]; + 0 -> 1 [label = "3"]; } \ No newline at end of file diff --git a/outFileApp.svg b/outFileApp.svg index c2656ff..0ce4552 100644 --- a/outFileApp.svg +++ b/outFileApp.svg @@ -4,459 +4,439 @@ - - + + finite_state_machine - - + + -15 - -15 +10 + +10 - + -3 - -3 +18 + +18 - + -15->3 - - -1 - - - -1 - -1 - - - -15->1 - - -1 - - - -19 - -19 - - - -15->19 - - -1 +10->18 + + +1 - + 12 - -12 + +12 - - -3->12 - - -1 - - - -13 - -13 - - - -3->13 - - -1 - - - -0 - -0 - - - -3->0 - - -13 - - - -1->0 - - -13 - - - -10 - -10 - - - -1->10 - - -1 - - - -8 - -8 - - - -1->8 - - -1 - - - -14 - -14 - - - -19->14 - - -1 - - - -12->19 - - -1 - - - -13->1 - - -1 - - - -13->19 - - -1 - - - -2 - -2 - - - -13->2 - - -1 - - - -0->3 - - -2 - - - -0->1 - - -2 + + +12->18 + + +1 - + 6 - -6 + +6 + + + +0 + +0 + + + +6->0 + + +49 + + + +11 + +11 + + + +6->11 + + +1 - + 0->6 - - -1 + + +1 + + + +2 + +2 - + 0->2 - - -2 + + +1 + + + +1 + +1 + + + +0->1 + + +3 - + 5 - -5 + +5 - + 0->5 - - -1 + + +1 + + + +4 + +4 + + + +0->4 + + +1 + + + +3 + +3 + + + +0->3 + + +2 - + 7 - -7 + +7 0->7 - - -1 + + +1 - - -4 - -4 - - - -0->4 - - -1 - - - -6->0 - - -49 - - - -11 - -11 - - - -6->11 - - -1 - - - -11->1 - - -1 - - - -11->19 - - -1 + + +11->18 + + +1 - + 11->2 - - -1 + + +1 - - -2->15 - - -1 + + +11->1 + + +1 - + 2->0 - - -10 + + +11 - - -16 - -16 + + +8 + +8 - + + +2->8 + + +1 + + -2->16 - - -1 +1->10 + + +1 + + + +1->0 + + +12 + + + +15 + +15 + + + +1->15 + + +1 + + + +13 + +13 + + + +1->13 + + +1 - + 5->0 - - -19 + + +19 - + 9 - -9 + +9 - + 5->9 - - -1 + + +1 - - -9->19 - - -1 - - - -14->7 - - -1 - - - -18 - -18 - - - -7->18 - - -1 - - - -18->19 - - -1 + + +9->18 + + +1 - + 17 - -17 + +17 - - -17->19 - - -1 + + +17->18 + + +1 - + 17->6 - - -1 + + +1 - + 17->5 - - -1 + + +1 - + 4->0 - - -1 + + +1 - + 4->17 - - -1 + + +1 - - -10->19 - - -1 + + +15->18 + + +1 - + + +15->2 + + +1 + + + +15->3 + + +1 + + + +3->12 + + +1 + + + +3->0 + + +13 + + + +16 + +16 + + -16->3 - - -1 +3->16 + + +1 - - -16->19 - - -1 + + +14 + +14 + + + +14->18 + + +1 + + + +7->14 + + +1 + + + +8->18 + + +1 + + + +8->1 + + +1 + + + +16->18 + + +1 + + + +16->2 + + +1 - + 16->5 - - -1 + + +1 - + 16->4 - - -1 + + +1 - - -8->19 - - -1 + + +13->18 + + +1 - - -8->2 - - -1 + + +13->2 + + +1 + + + +13->3 + + +1