finished testing and corrected typos
This commit is contained in:
rlacroix
parent
b357f939eb
commit
212d6f6022
5 changed files with 167 additions and 150 deletions
|
|
@ -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#"
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
24
outFileApp
24
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"];
|
||||
}
|
||||
254
outFileApp.svg
254
outFileApp.svg
|
|
@ -4,155 +4,169 @@
|
|||
<!-- Generated by graphviz version 2.50.0 (0)
|
||||
-->
|
||||
<!-- Title: finite_state_machine Pages: 1 -->
|
||||
<svg width="632pt" height="174pt"
|
||||
viewBox="0.00 0.00 632.00 174.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 170)">
|
||||
<svg width="420pt" height="313pt"
|
||||
viewBox="0.00 0.00 420.00 313.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 309)">
|
||||
<title>finite_state_machine</title>
|
||||
<polygon fill="white" stroke="transparent" points="-4,4 -4,-170 628,-170 628,4 -4,4"/>
|
||||
<!-- 2 -->
|
||||
<polygon fill="white" stroke="transparent" points="-4,4 -4,-309 416,-309 416,4 -4,4"/>
|
||||
<!-- 5 -->
|
||||
<g id="node1" class="node">
|
||||
<title>2</title>
|
||||
<ellipse fill="none" stroke="black" cx="18" cy="-75" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="18" y="-71.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
|
||||
<title>5</title>
|
||||
<ellipse fill="none" stroke="black" cx="314" cy="-78" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="314" y="-74.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">5</text>
|
||||
</g>
|
||||
<!-- 0 -->
|
||||
<!-- 8 -->
|
||||
<g id="node2" class="node">
|
||||
<title>0</title>
|
||||
<ellipse fill="none" stroke="black" cx="98" cy="-113" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="98" y="-109.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0</text>
|
||||
<title>8</title>
|
||||
<ellipse fill="none" stroke="black" cx="394" cy="-178" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="394" y="-174.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">8</text>
|
||||
</g>
|
||||
<!-- 2->0 -->
|
||||
<!-- 5->8 -->
|
||||
<g id="edge1" class="edge">
|
||||
<title>2->0</title>
|
||||
<path fill="none" stroke="black" d="M29.83,-88.79C36.11,-95.75 44.61,-103.63 54,-108 58.9,-110.28 64.44,-111.68 69.87,-112.5"/>
|
||||
<polygon fill="black" stroke="black" points="69.71,-116 79.99,-113.47 70.37,-109.03 69.71,-116"/>
|
||||
<text text-anchor="middle" x="58" y="-113.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<title>5->8</title>
|
||||
<path fill="none" stroke="black" d="M327.24,-90.29C336.17,-99.51 348.34,-112.62 358,-125 365.19,-134.23 372.44,-144.91 378.45,-154.25"/>
|
||||
<polygon fill="black" stroke="black" points="375.5,-156.13 383.8,-162.71 381.42,-152.39 375.5,-156.13"/>
|
||||
<text text-anchor="middle" x="354" y="-128.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 3 -->
|
||||
<g id="node3" class="node">
|
||||
<title>3</title>
|
||||
<ellipse fill="none" stroke="black" cx="152" cy="-287" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="152" y="-283.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
|
||||
</g>
|
||||
<!-- 3->8 -->
|
||||
<g id="edge2" class="edge">
|
||||
<title>3->8</title>
|
||||
<path fill="none" stroke="black" d="M170.03,-286.66C203.72,-285.23 280.06,-278.15 332,-244 349.49,-232.5 365.4,-214.93 376.59,-200.81"/>
|
||||
<polygon fill="black" stroke="black" points="379.61,-202.61 382.91,-192.54 374.05,-198.36 379.61,-202.61"/>
|
||||
<text text-anchor="middle" x="260" y="-280.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 4 -->
|
||||
<g id="node4" class="node">
|
||||
<title>4</title>
|
||||
<ellipse fill="none" stroke="black" cx="260" cy="-243" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="260" y="-239.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
|
||||
</g>
|
||||
<!-- 4->8 -->
|
||||
<g id="edge3" class="edge">
|
||||
<title>4->8</title>
|
||||
<path fill="none" stroke="black" d="M276.4,-235.42C298.93,-224.32 341.13,-203.54 368.1,-190.26"/>
|
||||
<polygon fill="black" stroke="black" points="369.86,-193.29 377.29,-185.74 366.77,-187.01 369.86,-193.29"/>
|
||||
<text text-anchor="middle" x="314" y="-228.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 7 -->
|
||||
<g id="node3" class="node">
|
||||
<g id="node5" class="node">
|
||||
<title>7</title>
|
||||
<ellipse fill="none" stroke="black" cx="152" cy="-18" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="152" y="-14.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">7</text>
|
||||
<ellipse fill="none" stroke="black" cx="314" cy="-132" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="314" y="-128.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">7</text>
|
||||
</g>
|
||||
<!-- 2->7 -->
|
||||
<g id="edge2" class="edge">
|
||||
<title>2->7</title>
|
||||
<path fill="none" stroke="black" d="M27.15,-58.99C33.15,-48.93 42.29,-36.65 54,-30 75.26,-17.93 103.32,-15.64 123.79,-15.95"/>
|
||||
<polygon fill="black" stroke="black" points="123.88,-19.46 134.01,-16.33 124.14,-12.46 123.88,-19.46"/>
|
||||
<text text-anchor="middle" x="58" y="-33.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 0->2 -->
|
||||
<g id="edge11" class="edge">
|
||||
<title>0->2</title>
|
||||
<path fill="none" stroke="black" d="M83.26,-102.22C77.03,-97.7 69.4,-92.65 62,-89 56.81,-86.44 51.04,-84.19 45.45,-82.29"/>
|
||||
<polygon fill="black" stroke="black" points="46.36,-78.91 35.77,-79.25 44.26,-85.59 46.36,-78.91"/>
|
||||
<text text-anchor="middle" x="58" y="-92.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<!-- 7->8 -->
|
||||
<g id="edge5" class="edge">
|
||||
<title>7->8</title>
|
||||
<path fill="none" stroke="black" d="M331.49,-137.14C339.74,-140.05 349.71,-144.1 358,-149 363.01,-151.96 368.04,-155.63 372.66,-159.34"/>
|
||||
<polygon fill="black" stroke="black" points="370.55,-162.14 380.44,-165.94 375.08,-156.8 370.55,-162.14"/>
|
||||
<text text-anchor="middle" x="354" y="-152.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 1 -->
|
||||
<g id="node6" class="node">
|
||||
<title>1</title>
|
||||
<ellipse fill="none" stroke="black" cx="526" cy="-105" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="526" y="-101.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<ellipse fill="none" stroke="black" cx="18" cy="-200" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="18" y="-196.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 0->1 -->
|
||||
<g id="edge12" class="edge">
|
||||
<title>0->1</title>
|
||||
<path fill="none" stroke="black" d="M113.85,-122.01C133.82,-133.24 170.79,-151 205,-151 205,-151 205,-151 447,-151 469.28,-151 490.81,-136.9 505.58,-124.31"/>
|
||||
<polygon fill="black" stroke="black" points="507.97,-126.87 513.05,-117.57 503.28,-121.67 507.97,-126.87"/>
|
||||
<text text-anchor="middle" x="326" y="-154.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 3 -->
|
||||
<g id="node9" class="node">
|
||||
<title>3</title>
|
||||
<ellipse fill="none" stroke="black" cx="206" cy="-105" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="206" y="-101.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
|
||||
</g>
|
||||
<!-- 0->3 -->
|
||||
<g id="edge13" class="edge">
|
||||
<title>0->3</title>
|
||||
<path fill="none" stroke="black" d="M116.03,-111.71C132.72,-110.46 158.42,-108.52 177.92,-107.04"/>
|
||||
<polygon fill="black" stroke="black" points="178.3,-110.52 188.01,-106.28 177.78,-103.54 178.3,-110.52"/>
|
||||
<text text-anchor="middle" x="152" y="-113.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 8 -->
|
||||
<g id="node4" class="node">
|
||||
<title>8</title>
|
||||
<ellipse fill="none" stroke="black" cx="366" cy="-61" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="366" y="-57.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">8</text>
|
||||
</g>
|
||||
<!-- 7->8 -->
|
||||
<g id="edge3" class="edge">
|
||||
<title>7->8</title>
|
||||
<path fill="none" stroke="black" d="M170.02,-18.74C198.26,-20.27 256.41,-24.75 304,-37 316.15,-40.13 329.15,-45.01 340.01,-49.56"/>
|
||||
<polygon fill="black" stroke="black" points="338.73,-52.82 349.3,-53.58 341.52,-46.4 338.73,-52.82"/>
|
||||
<text text-anchor="middle" x="246" y="-30.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 4 -->
|
||||
<g id="node7" class="node">
|
||||
<title>4</title>
|
||||
<ellipse fill="none" stroke="black" cx="446" cy="-105" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="446" y="-101.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
|
||||
</g>
|
||||
<!-- 8->4 -->
|
||||
<g id="edge7" class="edge">
|
||||
<title>8->4</title>
|
||||
<path fill="none" stroke="black" d="M382.04,-69.48C393.15,-75.75 408.51,-84.41 421.27,-91.61"/>
|
||||
<polygon fill="black" stroke="black" points="419.58,-94.68 430.01,-96.54 423.02,-88.58 419.58,-94.68"/>
|
||||
<text text-anchor="middle" x="406" y="-87.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 5 -->
|
||||
<g id="node5" class="node">
|
||||
<title>5</title>
|
||||
<ellipse fill="none" stroke="black" cx="606" cy="-75" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="606" y="-71.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">5</text>
|
||||
</g>
|
||||
<!-- 5->8 -->
|
||||
<!-- 7->1 -->
|
||||
<g id="edge4" class="edge">
|
||||
<title>5->8</title>
|
||||
<path fill="none" stroke="black" d="M587.72,-73.98C546.83,-71.58 443.85,-65.52 394.37,-62.61"/>
|
||||
<polygon fill="black" stroke="black" points="394.3,-59.1 384.12,-62.01 393.89,-66.09 394.3,-59.1"/>
|
||||
<text text-anchor="middle" x="486" y="-71.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<title>7->1</title>
|
||||
<path fill="none" stroke="black" d="M306.99,-148.82C301.51,-161.41 292.12,-177.83 278,-186 239.28,-208.42 104.64,-204.47 46.3,-201.58"/>
|
||||
<polygon fill="black" stroke="black" points="46.19,-198.07 36.02,-201.04 45.82,-205.06 46.19,-198.07"/>
|
||||
<text text-anchor="middle" x="152" y="-206.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 1->5 -->
|
||||
<g id="edge5" class="edge">
|
||||
<title>1->5</title>
|
||||
<path fill="none" stroke="black" d="M543.16,-98.78C553.62,-94.76 567.46,-89.44 579.4,-84.85"/>
|
||||
<polygon fill="black" stroke="black" points="580.78,-88.06 588.86,-81.21 578.27,-81.53 580.78,-88.06"/>
|
||||
<text text-anchor="middle" x="566" y="-93.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<!-- 1->3 -->
|
||||
<g id="edge11" class="edge">
|
||||
<title>1->3</title>
|
||||
<path fill="none" stroke="black" d="M24.78,-216.93C30.25,-230.5 39.77,-249.02 54,-260 74.15,-275.55 102.76,-282.14 123.69,-284.94"/>
|
||||
<polygon fill="black" stroke="black" points="123.52,-288.44 133.85,-286.09 124.3,-281.49 123.52,-288.44"/>
|
||||
<text text-anchor="middle" x="58" y="-268.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 4->1 -->
|
||||
<g id="edge6" class="edge">
|
||||
<title>4->1</title>
|
||||
<path fill="none" stroke="black" d="M464.31,-105C474.11,-105 486.58,-105 497.67,-105"/>
|
||||
<polygon fill="black" stroke="black" points="497.74,-108.5 507.74,-105 497.74,-101.5 497.74,-108.5"/>
|
||||
<text text-anchor="middle" x="486" y="-108.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<!-- 1->4 -->
|
||||
<g id="edge12" class="edge">
|
||||
<title>1->4</title>
|
||||
<path fill="none" stroke="black" d="M34.76,-207.24C40.68,-209.71 47.55,-212.28 54,-214 116.38,-230.63 192.14,-238.2 231.8,-241.24"/>
|
||||
<polygon fill="black" stroke="black" points="231.76,-244.74 241.99,-241.98 232.27,-237.76 231.76,-244.74"/>
|
||||
<text text-anchor="middle" x="98" y="-230.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 6 -->
|
||||
<g id="node8" class="node">
|
||||
<g id="node9" class="node">
|
||||
<title>6</title>
|
||||
<ellipse fill="none" stroke="black" cx="286" cy="-64" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="286" y="-60.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">6</text>
|
||||
<ellipse fill="none" stroke="black" cx="98" cy="-154" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="98" y="-150.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">6</text>
|
||||
</g>
|
||||
<!-- 6->2 -->
|
||||
<!-- 1->6 -->
|
||||
<g id="edge13" class="edge">
|
||||
<title>1->6</title>
|
||||
<path fill="none" stroke="black" d="M31.56,-187.94C37.92,-182.27 45.99,-175.74 54,-171 59.31,-167.86 65.31,-165.07 71.11,-162.71"/>
|
||||
<polygon fill="black" stroke="black" points="72.4,-165.96 80.51,-159.14 69.92,-159.41 72.4,-165.96"/>
|
||||
<text text-anchor="middle" x="58" y="-174.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 2 -->
|
||||
<g id="node7" class="node">
|
||||
<title>2</title>
|
||||
<ellipse fill="none" stroke="black" cx="206" cy="-94" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="206" y="-90.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
|
||||
</g>
|
||||
<!-- 2->5 -->
|
||||
<g id="edge7" class="edge">
|
||||
<title>2->5</title>
|
||||
<path fill="none" stroke="black" d="M224.03,-91.43C240.72,-88.91 266.42,-85.03 285.92,-82.09"/>
|
||||
<polygon fill="black" stroke="black" points="286.65,-85.52 296.01,-80.56 285.6,-78.6 286.65,-85.52"/>
|
||||
<text text-anchor="middle" x="260" y="-92.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 2->7 -->
|
||||
<g id="edge8" class="edge">
|
||||
<title>6->2</title>
|
||||
<path fill="none" stroke="black" d="M267.75,-64.71C222.68,-66.58 101.09,-71.61 46.36,-73.87"/>
|
||||
<polygon fill="black" stroke="black" points="45.89,-70.38 36.04,-74.3 46.18,-77.38 45.89,-70.38"/>
|
||||
<text text-anchor="middle" x="152" y="-73.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<title>2->7</title>
|
||||
<path fill="none" stroke="black" d="M222.96,-100.6C228.91,-103 235.74,-105.69 242,-108 256.79,-113.45 273.48,-119.12 286.96,-123.57"/>
|
||||
<polygon fill="black" stroke="black" points="285.96,-126.93 296.55,-126.72 288.14,-120.28 285.96,-126.93"/>
|
||||
<text text-anchor="middle" x="260" y="-124.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 0 -->
|
||||
<g id="node8" class="node">
|
||||
<title>0</title>
|
||||
<ellipse fill="none" stroke="black" cx="314" cy="-18" rx="18" ry="18"/>
|
||||
<text text-anchor="middle" x="314" y="-14.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0</text>
|
||||
</g>
|
||||
<!-- 2->0 -->
|
||||
<g id="edge6" class="edge">
|
||||
<title>2->0</title>
|
||||
<path fill="none" stroke="black" d="M220.03,-82.64C226.5,-77.14 234.52,-70.55 242,-65 257.48,-53.51 275.62,-41.53 289.69,-32.54"/>
|
||||
<polygon fill="black" stroke="black" points="291.7,-35.41 298.27,-27.1 287.95,-29.49 291.7,-35.41"/>
|
||||
<text text-anchor="middle" x="260" y="-68.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
|
||||
</g>
|
||||
<!-- 0->1 -->
|
||||
<g id="edge15" class="edge">
|
||||
<title>0->1</title>
|
||||
<path fill="none" stroke="black" d="M296.82,-12.4C282.18,-8.21 260.18,-4.12 242,-10 148.05,-40.38 68.36,-133.94 35.32,-177.39"/>
|
||||
<polygon fill="black" stroke="black" points="32.35,-175.52 29.17,-185.62 37.96,-179.71 32.35,-175.52"/>
|
||||
<text text-anchor="middle" x="152" y="-76.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
|
||||
</g>
|
||||
<!-- 0->2 -->
|
||||
<g id="edge14" class="edge">
|
||||
<title>0->2</title>
|
||||
<path fill="none" stroke="black" d="M296.29,-14.77C280.87,-12.75 258,-12.25 242,-23 227.12,-33 218.32,-51.24 213.26,-66.73"/>
|
||||
<polygon fill="black" stroke="black" points="209.88,-65.81 210.45,-76.39 216.6,-67.77 209.88,-65.81"/>
|
||||
<text text-anchor="middle" x="260" y="-26.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
|
||||
</g>
|
||||
<!-- 6->8 -->
|
||||
<g id="edge9" class="edge">
|
||||
<title>6->8</title>
|
||||
<path fill="none" stroke="black" d="M304.31,-63.33C314.17,-62.95 326.75,-62.47 337.9,-62.04"/>
|
||||
<polygon fill="black" stroke="black" points="338.15,-65.54 348.01,-61.65 337.88,-58.54 338.15,-65.54"/>
|
||||
<text text-anchor="middle" x="326" y="-65.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<path fill="none" stroke="black" d="M116.08,-155.39C164.99,-159.39 305.95,-170.89 365.7,-175.77"/>
|
||||
<polygon fill="black" stroke="black" points="365.62,-179.28 375.88,-176.6 366.19,-172.3 365.62,-179.28"/>
|
||||
<text text-anchor="middle" x="260" y="-171.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
<!-- 3->6 -->
|
||||
<!-- 6->2 -->
|
||||
<g id="edge10" class="edge">
|
||||
<title>3->6</title>
|
||||
<path fill="none" stroke="black" d="M222.41,-96.9C233.31,-91.17 248.14,-83.38 260.63,-76.81"/>
|
||||
<polygon fill="black" stroke="black" points="262.4,-79.83 269.62,-72.08 259.14,-73.64 262.4,-79.83"/>
|
||||
<text text-anchor="middle" x="246" y="-88.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
<title>6->2</title>
|
||||
<path fill="none" stroke="black" d="M113.91,-144.88C120.1,-141.14 127.36,-136.81 134,-133 149.46,-124.12 167.01,-114.47 180.8,-107"/>
|
||||
<polygon fill="black" stroke="black" points="182.54,-110.04 189.67,-102.2 179.21,-103.88 182.54,-110.04"/>
|
||||
<text text-anchor="middle" x="152" y="-136.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 9 KiB |
|
|
@ -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")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue