diff --git a/_build/_digests b/_build/_digests index 2fecf93..4e9633e 100644 --- a/_build/_digests +++ b/_build/_digests @@ -1,18 +1,18 @@ "Rule: ocaml dependencies ml (%=src/appTools )": "\012%\144C\164|\170\156B\169:\0193\177SJ" -"Rule: ocaml: ml & cmi -> cmx & o (%=src/display )": "\239\213\229\211j!\190#\027U\183\135\175^\143<" "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 )": "\239\213\229\211j!\190#\027U\183\135\175^\143<" "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" -"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/appTools.ml": "\213\031\163<\142\00535\157=\207}9|\135\230" "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": "\213\031\163<\142\00535\157=\207}9|\135\230" "Rule: ocaml: ml & cmi -> cmx & o (%=src/gfile )": "\236O\148Y\157m\028\183\166?\231a\231\187u\132" +"Rule: ocaml: cmx* & o* -> native (%=src/appMedium )": "\141/)\246;g2kJ3\146r\172^(\012" "Rule: ocaml dependencies mli (%=src/display )": "\231~k=1\249%\182S0\233D\212\252\223\161" -"Rule: ocaml: cmx* & o* -> native (%=src/appMedium )": "\171*\174\n\255\2036 -\1577\209^\246.\030" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/fordFulkerson.ml": "qra\159@\212u\200\192\132V9-\127\2022" -"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" +"Rule: ocaml: mli -> cmi (%=src/display )": "\165\163&C\247\02392\222\141}\166\237\209\226\196" "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" -"Rule: ocaml: ml & cmi -> cmx & o (%=src/fordFulkerson )": "NH\210[_\240)6\144(\177'?\001\2204" "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 )": "NH\210[_\240)6\144(\177'?\001\2204" "Rule: ocaml: mli -> cmi (%=src/tools )": "\239.\206\1667\139\246~\227$\235l\012\210\208;" "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" @@ -22,26 +22,26 @@ "Rule: ocaml: ml & cmi -> cmx & o (%=src/appMedium )": "d\031\192\1383\182\210\211sRe\237\024u\152\030" "Rule: ocaml dependencies ml (%=src/tools )": ",\255!)\2477ygb7\022\204V\143/$" "Rule: ocaml: mli -> cmi (%=src/ioApp )": "%\246\167\224\"c>\168\bS,X|ym6" -"Rule: ocaml dependencies ml (%=src/ioApp )": "\018e\252P\t\201H\255\172\246\229\216\157\215K," -"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ioApp.ml": "B,X\213@!\026\151\188\255e\176}\139\169m" -"Rule: ocaml dependencies mli (%=src/fordFulkerson )": "\022\200\166Dz0\003\233z\198y\144S\162\2034" +"Rule: ocaml dependencies ml (%=src/ioApp )": "o[\196\152]\007R\152\141\185\244\004\206\182\243\018" +"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ioApp.ml": "X\001\188\187\150\143`\138\203\220\200\255\226\147f\210" "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/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 )": "\212\238\215\019\142\150\225\1679\224\176`\241)\222g" -"Rule: ocaml dependencies ml (%=src/fordFulkerson )": "P\128\241\162\216\228\240\163<\168\241\235\129v\231\185" "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 )": "P\128\241\162\216\228\240\163<\168\241\235\129v\231\185" "Rule: ocaml: ml & cmi -> cmx & o (%=src/appTools )": "\172]O\222\166\169W\240\018,\242\239\135\204i\030" "Rule: ocaml dependencies ml (%=src/appMedium )": "\194'6c-A\131\130m&\231 0c\152\170" -"Rule: ocaml: ml & cmi -> cmx & o (%=src/ioApp )": "\016\140\158\221\016\024\205\248\132Yl\002\245\182O\187" +"Rule: ocaml: ml & cmi -> cmx & o (%=src/ioApp )": "\224z\001\022x\219H\213k<\209.\247\168\193b" "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 ml (%=src/display )": "\150I\199\147\226\208\148\192\184y\253\190\201\006>\168" "Rule: ocaml dependencies mli (%=src/graph )": "\012\213_n\023=\207kZ+\251(^M\2028" +"Rule: ocaml dependencies ml (%=src/display )": "\150I\199\147\226\208\148\192\184y\253\190\201\006>\168" "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": "^3NHM\196\012|O\139v\169l\149y\145" -"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+" +"Rule: ocaml dependencies ml (%=src/gfile )": "U4(<\t=rQ\240c\0278\231N\1949" "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/display.ml": "\253\183m\179\227\189\240\189Z\198>\208jt\007#" diff --git a/_build/_log b/_build/_log index 5b3b322..dd02dbb 100644 --- a/_build/_log +++ b/_build/_log @@ -1,6 +1,6 @@ ### Starting build. # Target: src/appMedium.ml.depends, tags: { extension:ml, file:src/appMedium.ml, include, ocaml, ocamldep, quiet, traverse } -/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/appMedium.ml > src/appMedium.ml.depends +/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/appMedium.ml > src/appMedium.ml.depends # cached # Target: src/appTools.mli.depends, tags: { extension:mli, file:src/appTools.mli, include, ocaml, ocamldep, quiet, traverse } /home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/appTools.mli > src/appTools.mli.depends # cached # Target: src/gfile.mli.depends, tags: { extension:mli, file:src/gfile.mli, include, ocaml, ocamldep, quiet, traverse } @@ -30,7 +30,7 @@ # Target: src/ioApp.cmi, tags: { byte, compile, extension:mli, file:src/ioApp.mli, include, interf, ocaml, quiet, traverse } /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/ioApp.cmi src/ioApp.mli # cached # Target: src/appMedium.cmo, tags: { byte, compile, extension:cmo, extension:ml, file:src/appMedium.cmo, file:src/appMedium.ml, implem, include, ocaml, quiet, traverse } -/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/appMedium.cmo src/appMedium.ml +/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/appMedium.cmo src/appMedium.ml # cached # Target: src/appTools.ml.depends, tags: { extension:ml, file:src/appTools.ml, include, ocaml, ocamldep, quiet, traverse } /home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/appTools.ml > src/appTools.ml.depends # cached # Target: src/gfile.ml.depends, tags: { extension:ml, file:src/gfile.ml, include, ocaml, ocamldep, quiet, traverse } @@ -60,7 +60,7 @@ # Target: src/ioApp.cmx, tags: { compile, extension:cmx, extension:ml, file:src/ioApp.cmx, file:src/ioApp.ml, implem, include, native, ocaml, quiet, traverse } /home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/ioApp.cmx src/ioApp.ml # cached # Target: src/appMedium.cmx, tags: { compile, extension:cmx, extension:ml, file:src/appMedium.cmx, file:src/appMedium.ml, implem, include, native, ocaml, quiet, traverse } -/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/appMedium.cmx src/appMedium.ml +/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/appMedium.cmx src/appMedium.ml # cached # Target: src/appMedium.native, tags: { dont_link_with, extension:native, file:src/appMedium.native, include, link, native, ocaml, program, quiet, traverse } -/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -I src src/graph.cmx src/gfile.cmx src/tools.cmx src/appTools.cmx src/display.cmx src/fordFulkerson.cmx src/ioApp.cmx src/appMedium.cmx -o src/appMedium.native +/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -I src src/graph.cmx src/gfile.cmx src/tools.cmx src/appTools.cmx src/display.cmx src/fordFulkerson.cmx src/ioApp.cmx src/appMedium.cmx -o src/appMedium.native # cached # Compilation successful. diff --git a/outFileApp b/outFileApp index 44e29fa..5972803 100644 --- a/outFileApp +++ b/outFileApp @@ -12,17 +12,19 @@ node [shape = circle]; - 2 -> 0 [label = "1"]; - 2 -> 7 [label = "1"]; - 7 -> 8 [label = "1"]; 5 -> 8 [label = "1"]; - 1 -> 5 [label = "1"]; - 4 -> 1 [label = "1"]; - 8 -> 4 [label = "1"]; - 6 -> 2 [label = "1"]; + 3 -> 8 [label = "1"]; + 4 -> 8 [label = "1"]; + 7 -> 1 [label = "1"]; + 7 -> 8 [label = "1"]; + 2 -> 0 [label = "3"]; + 2 -> 5 [label = "1"]; + 2 -> 7 [label = "1"]; 6 -> 8 [label = "1"]; - 3 -> 6 [label = "1"]; - 0 -> 2 [label = "1"]; - 0 -> 1 [label = "1"]; - 0 -> 3 [label = "1"]; + 6 -> 2 [label = "1"]; + 1 -> 3 [label = "1"]; + 1 -> 4 [label = "1"]; + 1 -> 6 [label = "1"]; + 0 -> 2 [label = "2"]; + 0 -> 1 [label = "3"]; } \ No newline at end of file diff --git a/outFileApp.svg b/outFileApp.svg index 02f5cd7..f2ef5f3 100644 --- a/outFileApp.svg +++ b/outFileApp.svg @@ -4,155 +4,169 @@ - - + + finite_state_machine - - + + -2 - -2 +5 + +5 - + -0 - -0 +8 + +8 - + -2->0 - - -1 +5->8 + + +1 + + + +3 + +3 + + + +3->8 + + +1 + + + +4 + +4 + + + +4->8 + + +1 - + 7 - -7 + +7 - - -2->7 - - -1 - - - -0->2 - - -1 + + +7->8 + + +1 1 - -1 + +1 - - -0->1 - - -1 - - - -3 - -3 - - - -0->3 - - -1 - - - -8 - -8 - - - -7->8 - - -1 - - - -4 - -4 - - - -8->4 - - -1 - - - -5 - -5 - - + -5->8 - - -1 +7->1 + + +1 - - -1->5 - - -1 + + +1->3 + + +1 - - -4->1 - - -1 + + +1->4 + + +1 - + 6 - -6 + +6 - + + +1->6 + + +1 + + + +2 + +2 + + + +2->5 + + +1 + + -6->2 - - -1 +2->7 + + +1 + + + +0 + +0 + + + +2->0 + + +3 + + + +0->1 + + +3 + + + +0->2 + + +2 6->8 - - -1 + + +1 - + -3->6 - - -1 +6->2 + + +1 diff --git a/src/ioApp.ml b/src/ioApp.ml index b078321..9b7fedf 100644 --- a/src/ioApp.ml +++ b/src/ioApp.ml @@ -92,11 +92,11 @@ let outputData g childrenList choicesList = (if fst x <> 0 then let childNodeId = fst x in - snd3 (List.find (fun a -> fst3 a = childNodeId) childrenList) + snd3 (List.find (fun a -> fst3 a = childNodeId) childrenList) ^ "/" else "" ) - ^ "/") xs + ) xs in inner2 "" (out_arcs g (snd3 activity)) @@ -114,6 +114,7 @@ let outputData g childrenList choicesList = in - inner "" g choicesList + inner "" g choicesList; print_string("\n the children that did not appear above could \ + not be assigned any activity")