added display support for ints + main tested. Ford Fulkerson Finished

_build/_digests

@@ -1,42 +1,42 @@
-"Rule: ocaml: ml & cmi -> cmx & o (%=src/display )": "\027\"r\253b.\004\234\141\ba\206\238\025\242r"
 "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/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/tools.mli": "9\173\222\177]e\245\229\131\151\020fsu\133@"
-"Rule: ocaml dependencies ml (%=src/ftest )": "\022\160\161\193C\022\254\133j\146\196\000-~(\161"
 "Rule: ocaml: ml & cmi -> cmx & o (%=src/gfile )": "\236O\148Y\157m\028\183\166?\231a\231\187u\132"
-"Rule: ocaml dependencies mli (%=src/display )": "+\178\012\248)#\197\218\144\1935\220\193\190\212\183"
-"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ftest.ml": "\204\235D\031\004O\173\136R\148y\171\207]&g"
+"Rule: ocaml dependencies ml (%=src/ftest )": "\129\231\129\216(|Io\133\186\180\221\250\\\208s"
+"Rule: ocaml dependencies mli (%=src/display )": "\231~k=1\249%\182S0\233D\212\252\223\161"
+"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/ftest.ml": "\134j\0044\254:\143\174\205\170s\173Q\171\183\185"
 "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 )": "\020\015~%\135\196\153\152}\154\244v\253$N\164"
 "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 )": "\158P\156*\236\171\2120>1Z\179\149\240\201."
 "Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/tools.ml": "\185\244\209\136L\1577;\191J\171\162M\135xa"
+"Rule: ocaml: ml & cmi -> cmx & o (%=src/fordFulkerson )": "NH\210[_\240)6\144(\177'?\001\2204"
+"Rule: ocaml: cmx* & o* -> native (%=src/ftest )": "\190\238\178*\217\183\208\002\243m\177K\227T\138*"
 "Rule: ocaml: mli -> cmi (%=src/tools )": "\239.\206\1667\139\246~\227$\235l\012\210\208;"
-"Rule: ocaml: cmx* & o* -> native (%=src/ftest )": "O\\\249\200\251,\018\028\206cr\144\204\180\181\214"
-"Rule: ocaml: ml & cmi -> cmx & o (%=src/ftest )": "8u\155\140\162\183(4F\239\206\198\150\176\162\227"
-"Rule: ocaml: mli -> cmi (%=src/fordFulkerson )": "\206\016hD\235I\220+\252\2129\195G\179\151g"
+"Rule: ocaml: mli -> cmi (%=src/fordFulkerson )": "v\184\208\237V\182T\138\168\207\20258\221\233s"
+"Rule: ocaml: ml & cmi -> cmx & o (%=src/ftest )": "S\179.\031\214@{\006P\197\221\"\003\t\173u"
 "Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/graph.ml": "\005\175.\2458\176E\202]\255\235=9\015\000\237"
 "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/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/graph.mli": "\031\217\135\022\208\254\154\148\252)\210\130\174\215X\031"
 "Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/gfile.mli": "\203\249\163Ct\234\0067d}\142\011m8T`"
-"Rule: ocaml dependencies ml (%=src/tools )": "\228\210\133\187`\193\179>\031\016\197\147\221\006j\017"
 "Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/tools.ml": "~[\186\208\199\129\006\030\012\196\245\183'\163\211&"
+"Rule: ocaml dependencies ml (%=src/tools )": "\228\210\133\187`\193\179>\031\016\197\147\221\006j\017"
 "Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/ftest.ml": "~\190 \235\142\210\r\222\253\136>\194\180\207\183\168"
-"Rule: ocaml: ml -> cmo & cmi (%=src/ftest )": "aTb\021\214\239K\186C,\231\n\012T'\136"
-"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: ml -> cmo & cmi (%=src/ftest )": "^\163\159\019\141kEw\168\171,\156\252=X\006"
 "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": "\129\140,\157Z\158D\177\144\227\139t\029Y\253\019"
+"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 )": "z\158\235\155v\003\214Q\150\t\224\"\026\246(\158"
-"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/gfile.ml": "\1966\177\141\185,fpl\1987gT\128b\028"
-"Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/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"
+"Resource: /home/alejeune/Documents/4ir/S1/Ocaml/FordFulkersonLeChameau/src/gfile.ml": "\1966\177\141\185,fpl\1987gT\128b\028"
+"Resource: /home/chepycou/Documents/cours/4-IR/functionalProgramming/Projet/repoGit/ocaml-maxflow-project/src/gfile.ml": "\1966\177\141\185,fpl\1987gT\128b\028"
 "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 )": "\162K\\\156\237a\012\132\237\169\243\248\212Sb\221"
 "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`"
-"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": "y\135\165\238\138M)N\224\237\005 \027+d\t"
+"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": "\253\183m\179\227\189\240\189Z\198>\208jt\007#"

_build/_log

@@ -1,8 +1,8 @@
 ### Starting build.
 # Target: src/ftest.ml.depends, tags: { extension:ml, file:src/ftest.ml, include, ocaml, ocamldep, quiet, traverse }
-/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/ftest.ml > src/ftest.ml.depends # cached
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/ftest.ml > src/ftest.ml.depends
 # Target: src/display.mli.depends, tags: { extension:mli, file:src/display.mli, include, ocaml, ocamldep, quiet, traverse }
-/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/display.mli > src/display.mli.depends
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/display.mli > src/display.mli.depends # cached
 # Target: src/gfile.mli.depends, tags: { extension:mli, file:src/gfile.mli, include, ocaml, ocamldep, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/gfile.mli > src/gfile.mli.depends # cached
 # Target: src/graph.mli.depends, tags: { extension:mli, file:src/graph.mli, include, ocaml, ocamldep, quiet, traverse }
@@ -11,23 +11,40 @@
 /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/graph.cmi src/graph.mli # cached
 # Target: src/gfile.cmi, tags: { byte, compile, extension:mli, file:src/gfile.mli, include, interf, ocaml, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/gfile.cmi src/gfile.mli # cached
+# Target: src/display.cmi, tags: { byte, compile, extension:mli, file:src/display.mli, include, interf, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/display.cmi src/display.mli # cached
 # Target: src/fordFulkerson.mli.depends, tags: { extension:mli, file:src/fordFulkerson.mli, include, ocaml, ocamldep, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/fordFulkerson.mli > src/fordFulkerson.mli.depends # cached
-# Target: src/display.cmi, tags: { byte, compile, extension:mli, file:src/display.mli, include, interf, ocaml, quiet, traverse }
-/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/display.cmi src/display.mli
 # Target: src/tools.mli.depends, tags: { extension:mli, file:src/tools.mli, include, ocaml, ocamldep, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/tools.mli > src/tools.mli.depends # cached
 # Target: src/tools.cmi, tags: { byte, compile, extension:mli, file:src/tools.mli, include, interf, ocaml, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/tools.cmi src/tools.mli # cached
 # Target: src/fordFulkerson.cmi, tags: { byte, compile, extension:mli, file:src/fordFulkerson.mli, include, interf, ocaml, quiet, traverse }
-/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/fordFulkerson.cmi src/fordFulkerson.mli
+/home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/fordFulkerson.cmi src/fordFulkerson.mli # cached
 # Target: src/ftest.cmo, tags: { byte, compile, extension:cmo, extension:ml, file:src/ftest.cmo, file:src/ftest.ml, implem, include, ocaml, quiet, traverse }
 /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/ftest.cmo src/ftest.ml
-+ /home/chepycou/.opam/4.14.0/bin/ocamlc.opt -c -I src -o src/ftest.cmo src/ftest.ml
-File "src/ftest.ml", line 40, characters 43-50:
-40 |       let () = exportDifference graphFinal outfile in
-                                                ^^^^^^^
-Error: This expression has type string but an expression was expected of type
-         int Graph.graph
-Command exited with code 2.
-# Compilation unsuccessful.
+# Target: src/display.ml.depends, tags: { extension:ml, file:src/display.ml, include, ocaml, ocamldep, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/display.ml > src/display.ml.depends # cached
+# Target: src/gfile.ml.depends, tags: { extension:ml, file:src/gfile.ml, include, ocaml, ocamldep, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/gfile.ml > src/gfile.ml.depends # cached
+# Target: src/graph.ml.depends, tags: { extension:ml, file:src/graph.ml, include, ocaml, ocamldep, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/graph.ml > src/graph.ml.depends # cached
+# Target: src/graph.cmx, tags: { compile, extension:cmx, extension:ml, file:src/graph.cmx, file:src/graph.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/graph.cmx src/graph.ml # cached
+# Target: src/gfile.cmx, tags: { compile, extension:cmx, extension:ml, file:src/gfile.cmx, file:src/gfile.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/gfile.cmx src/gfile.ml # cached
+# Target: src/display.cmx, tags: { compile, extension:cmx, extension:ml, file:src/display.cmx, file:src/display.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/display.cmx src/display.ml # cached
+# Target: src/fordFulkerson.ml.depends, tags: { extension:ml, file:src/fordFulkerson.ml, include, ocaml, ocamldep, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/fordFulkerson.ml > src/fordFulkerson.ml.depends # cached
+# Target: src/tools.ml.depends, tags: { extension:ml, file:src/tools.ml, include, ocaml, ocamldep, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamldep.opt -modules src/tools.ml > src/tools.ml.depends # cached
+# Target: src/tools.cmx, tags: { compile, extension:cmx, extension:ml, file:src/tools.cmx, file:src/tools.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/tools.cmx src/tools.ml # cached
+# Target: src/fordFulkerson.cmx, tags: { compile, extension:cmx, extension:ml, file:src/fordFulkerson.cmx, file:src/fordFulkerson.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/fordFulkerson.cmx src/fordFulkerson.ml # cached
+# Target: src/ftest.cmx, tags: { compile, extension:cmx, extension:ml, file:src/ftest.cmx, file:src/ftest.ml, implem, include, native, ocaml, quiet, traverse }
+/home/chepycou/.opam/4.14.0/bin/ocamlopt.opt -c -I src -o src/ftest.cmx src/ftest.ml
+# Target: src/ftest.native, tags: { dont_link_with, extension:native, file:src/ftest.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/display.cmx src/tools.cmx src/fordFulkerson.cmx src/ftest.cmx -o src/ftest.native
+# Compilation successful.

_build/src/ftest.ml

@@ -33,12 +33,13 @@
 
       let graphInt = gmap graph int_of_string in
 
-      let graphSolved = main graphInt 0 5 in
+      let graphSolved = main graphInt 0 3 in
 
-      let graphFinal = gmap graphSolved string_of_int in
 
-      let () = exportDifference graphFinal outfile in
+       let () = exportDifference graphInt graphSolved outfile in
       ()
+
+
       (* Rewrite the graph that has been read.
       let () = write_file outfile graphDot in
       ()

outfile

@@ -1,29 +1,25 @@
 
-    digraph finite_state_machine {
+        digraph finite_state_machine {
 
-    	fontname="Helvetica,Arial,sans-serif"
+            fontname="Helvetica,Arial,sans-serif"
 
-    	node [fontname="Helvetica,Arial,sans-serif"]
+            node [fontname="Helvetica,Arial,sans-serif"]
 
-    	edge [fontname="Helvetica,Arial,sans-serif"]
+            edge [fontname="Helvetica,Arial,sans-serif"]
 
-    	rankdir=LR;
+            rankdir=LR;
 
-    	node [shape = circle];
+            node [shape = circle];
 
-    
- 5 -> 1 [label = "17"];
- 5 -> 4 [label = "8"];
- 1 -> 5 [label = "4"];
- 1 -> 3 [label = "10"];
- 1 -> 0 [label = "7"];
- 1 -> 4 [label = "1"];
- 3 -> 1 [label = "1"];
- 3 -> 0 [label = "10"];
- 3 -> 2 [label = "2"];
- 3 -> 4 [label = "5"];
- 2 -> 0 [label = "8"];
- 2 -> 4 [label = "4"];
- 4 -> 2 [label = "8"];
- 4 -> 5 [label = "6"];
+        
+ 4 -> 5 [label = "0/14"];
+ 1 -> 5 [label = "0/21"];
+ 1 -> 4 [label = "0/1"];
+ 3 -> 1 [label = "0/11"];
+ 3 -> 2 [label = "0/2"];
+ 3 -> 4 [label = "0/5"];
+ 2 -> 4 [label = "0/12"];
+ 0 -> 1 [label = "0/7"];
+ 0 -> 3 [label = "10/10"];
+ 0 -> 2 [label = "0/8"];
 }

src/display.ml

@@ -5,7 +5,10 @@ open Gfile
 let exportBase g path =
     let str = e_fold
         g
-        (fun x id1 id2 label -> x ^ "\n " ^ (string_of_int id1) ^ " -> " ^ (string_of_int id2) ^ " [label = \"" ^ label ^"\"];" )
+        (fun x id1 id2 label -> x ^ "\n "
+            ^ (string_of_int id1) ^ " -> "
+            ^ (string_of_int id2) ^ " [label = \""
+            ^ (string_of_int label) ^ "\"];" )
         ""
     in
 
@@ -40,7 +43,11 @@ let exportDifference gStart gEnd path =
     in
         let str = e_fold
             gStart
-            (fun x id1 id2 label -> x ^ "\n " ^ (string_of_int id1) ^ " -> " ^ (string_of_int id2) ^ " [label = \"" ^ string_of_int (findUsedCapacity gEnd id1 id2 (int_of_string label))  ^ "/" ^ label  ^"\"];" )
+            (fun x id1 id2 label -> x ^ "\n "
+                ^ (string_of_int id1) ^ " -> "
+                ^ (string_of_int id2) ^ " [label = \""
+                ^ string_of_int (findUsedCapacity gEnd id1 id2 label)  ^ "/"
+                ^ (string_of_int label)  ^"\"];" )
             ""
         in
 

src/display.mli

@@ -1,4 +1,4 @@
 open Graph
 open Gfile
-val exportBase: string graph -> path -> unit
-val exportDifference: string graph -> int graph -> path -> unit
+val exportBase: int graph -> path -> unit
+val exportDifference: int graph -> int graph -> path -> unit

src/ftest.ml

@@ -33,13 +33,10 @@
 
       let graphInt = gmap graph int_of_string in
 
-      let graphSolved = main graphInt 0 5 in
+      let graphSolved = main graphInt 0 3 in
 
-      let graphFinal = gmap graphSolved string_of_int in
 
-
-      (*TODO : gérer les strings / non-strings ==> tout display à partir de type INT ça sera plus simple *)
-      let () = exportDifference graphFinal outfile in
+       let () = exportDifference graphInt graphSolved outfile in
       ()
 
 

test.svg

@@ -4,144 +4,116 @@
 <!-- Generated by graphviz version 2.50.0 (0)
  -->
 <!-- Title: finite_state_machine Pages: 1 -->
-<svg width="468pt" height="221pt"
- viewBox="0.00 0.00 468.00 221.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 217)">
+<svg width="447pt" height="155pt"
+ viewBox="0.00 0.00 447.00 155.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 151)">
 <title>finite_state_machine</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-217 464,-217 464,4 -4,4"/>
-<!-- 5 -->
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-151 443,-151 443,4 -4,4"/>
+<!-- 4 -->
 <g id="node1" class="node">
-<title>5</title>
-<ellipse fill="none" stroke="black" cx="18" cy="-18" rx="18" ry="18"/>
-<text text-anchor="middle" x="18" y="-14.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">5</text>
+<title>4</title>
+<ellipse fill="none" stroke="black" cx="322" cy="-77" rx="18" ry="18"/>
+<text text-anchor="middle" x="322" y="-73.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
 </g>
-<!-- 1 -->
+<!-- 5 -->
 <g id="node2" class="node">
-<title>1</title>
-<ellipse fill="none" stroke="black" cx="106" cy="-78" rx="18" ry="18"/>
-<text text-anchor="middle" x="106" y="-74.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
+<title>5</title>
+<ellipse fill="none" stroke="black" cx="421" cy="-108" rx="18" ry="18"/>
+<text text-anchor="middle" x="421" y="-104.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">5</text>
 </g>
-<!-- 5&#45;&gt;1 -->
+<!-- 4&#45;&gt;5 -->
 <g id="edge1" class="edge">
-<title>5&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M29.99,-31.49C36.44,-38.8 45.06,-47.62 54,-54 61.67,-59.47 70.79,-64.23 79.18,-68.02"/>
-<polygon fill="black" stroke="black" points="77.99,-71.32 88.56,-72.03 80.74,-64.89 77.99,-71.32"/>
-<text text-anchor="middle" x="62" y="-66.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">17</text>
+<title>4&#45;&gt;5</title>
+<path fill="none" stroke="black" d="M339.45,-82.26C354.37,-87.02 376.59,-94.13 393.92,-99.66"/>
+<polygon fill="black" stroke="black" points="392.87,-103.01 403.46,-102.72 395,-96.34 392.87,-103.01"/>
+<text text-anchor="middle" x="371.5" y="-99.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/14</text>
 </g>
-<!-- 4 -->
+<!-- 1 -->
 <g id="node3" class="node">
-<title>4</title>
-<ellipse fill="none" stroke="black" cx="274" cy="-43" rx="18" ry="18"/>
-<text text-anchor="middle" x="274" y="-39.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
+<title>1</title>
+<ellipse fill="none" stroke="black" cx="223" cy="-129" rx="18" ry="18"/>
+<text text-anchor="middle" x="223" y="-125.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
 </g>
-<!-- 5&#45;&gt;4 -->
-<g id="edge2" class="edge">
-<title>5&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M36.01,-19.23C45.93,-19.97 58.68,-20.97 70,-22 133.06,-27.73 206.99,-35.69 245.9,-39.98"/>
-<polygon fill="black" stroke="black" points="245.58,-43.47 255.9,-41.09 246.35,-36.51 245.58,-43.47"/>
-<text text-anchor="middle" x="150" y="-33.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">8</text>
+<!-- 1&#45;&gt;4 -->
+<g id="edge3" class="edge">
+<title>1&#45;&gt;4</title>
+<path fill="none" stroke="black" d="M238.35,-118.9C244.57,-114.7 252.02,-109.9 259,-106 270.79,-99.41 284.34,-92.95 295.76,-87.81"/>
+<polygon fill="black" stroke="black" points="297.42,-90.91 305.15,-83.66 294.58,-84.51 297.42,-90.91"/>
+<text text-anchor="middle" x="272.5" y="-109.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/1</text>
 </g>
 <!-- 1&#45;&gt;5 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
 <title>1&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M95.96,-63.01C89.7,-53.77 80.61,-42.33 70,-35 62.87,-30.08 54.21,-26.49 46.06,-23.91"/>
-<polygon fill="black" stroke="black" points="46.74,-20.47 36.17,-21.17 44.87,-27.22 46.74,-20.47"/>
-<text text-anchor="middle" x="62" y="-38.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
-</g>
-<!-- 1&#45;&gt;4 -->
-<g id="edge6" class="edge">
-<title>1&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M123.83,-74.45C152.66,-68.37 211.73,-55.92 246.26,-48.64"/>
-<polygon fill="black" stroke="black" points="247.06,-52.05 256.12,-46.56 245.62,-45.2 247.06,-52.05"/>
-<text text-anchor="middle" x="194" y="-66.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
+<path fill="none" stroke="black" d="M240.99,-128.14C270.43,-126.52 332.78,-122.47 385,-115 387.72,-114.61 390.56,-114.15 393.38,-113.64"/>
+<polygon fill="black" stroke="black" points="394.17,-117.05 403.33,-111.73 392.85,-110.18 394.17,-117.05"/>
+<text text-anchor="middle" x="322" y="-126.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/21</text>
 </g>
 <!-- 3 -->
 <g id="node4" class="node">
 <title>3</title>
-<ellipse fill="none" stroke="black" cx="194" cy="-109" rx="18" ry="18"/>
-<text text-anchor="middle" x="194" y="-105.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
-</g>
-<!-- 1&#45;&gt;3 -->
-<g id="edge4" class="edge">
-<title>1&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M124.08,-75.98C134.26,-75.43 147.24,-75.88 158,-80 163.53,-82.12 168.82,-85.48 173.54,-89.18"/>
-<polygon fill="black" stroke="black" points="171.52,-92.06 181.35,-96.01 176.12,-86.79 171.52,-92.06"/>
-<text text-anchor="middle" x="150" y="-83.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">10</text>
-</g>
-<!-- 0 -->
-<g id="node5" class="node">
-<title>0</title>
-<ellipse fill="none" stroke="black" cx="442" cy="-152" rx="18" ry="18"/>
-<text text-anchor="middle" x="442" y="-148.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0</text>
+<ellipse fill="none" stroke="black" cx="124" cy="-72" rx="18" ry="18"/>
+<text text-anchor="middle" x="124" y="-68.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">3</text>
 </g>
-<!-- 1&#45;&gt;0 -->
-<g id="edge5" class="edge">
-<title>1&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M110.87,-95.45C119.4,-128.73 143.15,-198 193,-198 193,-198 193,-198 363,-198 385.28,-198 406.81,-183.9 421.58,-171.31"/>
-<polygon fill="black" stroke="black" points="423.97,-173.87 429.05,-164.57 419.28,-168.67 423.97,-173.87"/>
-<text text-anchor="middle" x="274" y="-201.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">7</text>
+<!-- 3&#45;&gt;4 -->
+<g id="edge6" class="edge">
+<title>3&#45;&gt;4</title>
+<path fill="none" stroke="black" d="M142.05,-72.43C176.08,-73.3 252.66,-75.26 293.74,-76.3"/>
+<polygon fill="black" stroke="black" points="293.76,-79.81 303.85,-76.56 293.94,-72.81 293.76,-79.81"/>
+<text text-anchor="middle" x="223" y="-77.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/5</text>
 </g>
-<!-- 4&#45;&gt;5 -->
-<g id="edge14" class="edge">
-<title>4&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M256.93,-36.84C234.98,-28.78 194.2,-15.09 158,-10 119.33,-4.56 74.11,-9.17 46.01,-13.32"/>
-<polygon fill="black" stroke="black" points="45.12,-9.91 35.78,-14.92 46.2,-16.83 45.12,-9.91"/>
-<text text-anchor="middle" x="150" y="-13.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">6</text>
+<!-- 3&#45;&gt;1 -->
+<g id="edge4" class="edge">
+<title>3&#45;&gt;1</title>
+<path fill="none" stroke="black" d="M140.22,-79.91C152.89,-86.6 171.33,-96.57 187,-106 190.96,-108.38 195.12,-111 199.12,-113.59"/>
+<polygon fill="black" stroke="black" points="197.24,-116.54 207.52,-119.11 201.09,-110.7 197.24,-116.54"/>
+<text text-anchor="middle" x="173.5" y="-109.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/11</text>
 </g>
 <!-- 2 -->
-<g id="node6" class="node">
+<g id="node5" class="node">
 <title>2</title>
-<ellipse fill="none" stroke="black" cx="362" cy="-93" rx="18" ry="18"/>
-<text text-anchor="middle" x="362" y="-89.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
+<ellipse fill="none" stroke="black" cx="223" cy="-18" rx="18" ry="18"/>
+<text text-anchor="middle" x="223" y="-14.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
 </g>
-<!-- 4&#45;&gt;2 -->
-<g id="edge13" class="edge">
-<title>4&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M289.98,-51.71C303.05,-59.31 322.24,-70.47 337.38,-79.27"/>
-<polygon fill="black" stroke="black" points="335.79,-82.39 346.19,-84.39 339.31,-76.34 335.79,-82.39"/>
-<text text-anchor="middle" x="318" y="-75.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">8</text>
+<!-- 3&#45;&gt;2 -->
+<g id="edge5" class="edge">
+<title>3&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M137.57,-59.96C143.94,-54.3 152,-47.77 160,-43 171.26,-36.29 184.65,-30.63 196.1,-26.41"/>
+<polygon fill="black" stroke="black" points="197.29,-29.7 205.56,-23.07 194.96,-23.1 197.29,-29.7"/>
+<text text-anchor="middle" x="173.5" y="-46.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/2</text>
 </g>
-<!-- 3&#45;&gt;1 -->
+<!-- 2&#45;&gt;4 -->
 <g id="edge7" class="edge">
-<title>3&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M176.22,-105.22C166.15,-102.75 153.17,-99.21 142,-95 138.61,-93.72 135.1,-92.24 131.68,-90.68"/>
-<polygon fill="black" stroke="black" points="132.94,-87.41 122.41,-86.24 129.92,-93.72 132.94,-87.41"/>
-<text text-anchor="middle" x="150" y="-103.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">1</text>
+<title>2&#45;&gt;4</title>
+<path fill="none" stroke="black" d="M240.64,-22.76C253.63,-26.92 271.8,-33.76 286,-43 291.78,-46.76 297.42,-51.57 302.43,-56.37"/>
+<polygon fill="black" stroke="black" points="300.2,-59.1 309.7,-63.77 305.19,-54.19 300.2,-59.1"/>
+<text text-anchor="middle" x="272.5" y="-46.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/12</text>
 </g>
-<!-- 3&#45;&gt;4 -->
-<g id="edge10" class="edge">
-<title>3&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M208.23,-97.8C220.22,-87.66 238.09,-72.54 252.03,-60.75"/>
-<polygon fill="black" stroke="black" points="254.33,-63.38 259.7,-54.25 249.81,-58.04 254.33,-63.38"/>
-<text text-anchor="middle" x="234" y="-80.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">5</text>
+<!-- 0 -->
+<g id="node6" class="node">
+<title>0</title>
+<ellipse fill="none" stroke="black" cx="18" cy="-72" rx="18" ry="18"/>
+<text text-anchor="middle" x="18" y="-68.3" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0</text>
 </g>
-<!-- 3&#45;&gt;0 -->
+<!-- 0&#45;&gt;1 -->
 <g id="edge8" class="edge">
-<title>3&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M211.28,-114.1C217.14,-115.82 223.83,-117.64 230,-119 295.34,-133.39 373.41,-143.89 413.79,-148.83"/>
-<polygon fill="black" stroke="black" points="413.56,-152.33 423.91,-150.05 414.4,-145.38 413.56,-152.33"/>
-<text text-anchor="middle" x="318" y="-139.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">10</text>
+<title>0&#45;&gt;1</title>
+<path fill="none" stroke="black" d="M33.98,-81.08C40.04,-84.5 47.21,-88.24 54,-91 99.35,-109.46 112.03,-111.17 160,-121 171.32,-123.32 183.96,-125.09 194.85,-126.37"/>
+<polygon fill="black" stroke="black" points="194.73,-129.88 205.05,-127.49 195.49,-122.92 194.73,-129.88"/>
+<text text-anchor="middle" x="124" y="-120.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/7</text>
 </g>
-<!-- 3&#45;&gt;2 -->
+<!-- 0&#45;&gt;3 -->
 <g id="edge9" class="edge">
-<title>3&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M212.14,-107.35C240.84,-104.58 298.87,-98.99 333.39,-95.66"/>
-<polygon fill="black" stroke="black" points="334.09,-99.11 343.7,-94.67 333.42,-92.14 334.09,-99.11"/>
-<text text-anchor="middle" x="274" y="-106.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">2</text>
+<title>0&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M36.17,-72C52.36,-72 76.87,-72 95.73,-72"/>
+<polygon fill="black" stroke="black" points="95.8,-75.5 105.8,-72 95.8,-68.5 95.8,-75.5"/>
+<text text-anchor="middle" x="71" y="-75.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">10/10</text>
 </g>
-<!-- 2&#45;&gt;4 -->
-<g id="edge12" class="edge">
-<title>2&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M354.62,-76.39C349.05,-64.44 339.68,-49.2 326,-42 318.62,-38.11 309.76,-37.22 301.51,-37.65"/>
-<polygon fill="black" stroke="black" points="301.1,-34.17 291.55,-38.77 301.88,-41.13 301.1,-34.17"/>
-<text text-anchor="middle" x="318" y="-45.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">4</text>
-</g>
-<!-- 2&#45;&gt;0 -->
-<g id="edge11" class="edge">
-<title>2&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M377.55,-102.71C385.98,-108.44 396.73,-115.94 406,-123 410.63,-126.52 415.5,-130.43 420.08,-134.19"/>
-<polygon fill="black" stroke="black" points="417.99,-137.01 427.91,-140.72 422.47,-131.63 417.99,-137.01"/>
-<text text-anchor="middle" x="402" y="-126.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">8</text>
+<!-- 0&#45;&gt;2 -->
+<g id="edge10" class="edge">
+<title>0&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M33.77,-62.89C50.59,-53 79.22,-37.6 106,-30 135.56,-21.61 170.84,-18.95 194.67,-18.18"/>
+<polygon fill="black" stroke="black" points="194.83,-21.67 204.75,-17.94 194.67,-14.68 194.83,-21.67"/>
+<text text-anchor="middle" x="124" y="-33.8" font-family="Helvetica,Arial,sans-serif" font-size="14.00">0/8</text>
 </g>
 </g>
 </svg>