Version fonctionnelle : Ford Fulkerson avec cout OK (TAF -> Commentaires, tests, emploi avec preferences)

Makefile

@@ -13,12 +13,18 @@ man:
 	@echo "\nTous ces modules sont testables (fichier de type 'nom_package'test.ml) grace au module test créé"
 	@echo "Il est possible de compiler ces fichiers de test avec la cible build_'nom_package'test, un fichier 'nom_package'test.native sera crée"
 	@echo "Il est possible d'executer ces fichiers de test avec la cible demo_'nom_package'test\n"
-	@echo "En ce qui concerne Ford Fulkerson, il a été dans codé le module flot, et, peut être lancé grace au fichier FordFulkerson.ml"
+	@echo "En ce qui concerne Ford Fulkerson, il a été codé dans le module flot, et, peut être lancé grace au fichier FordFulkerson.ml"
 	@echo "Pour simplifier son utilisation, la aussi, des cibles ont été créées : "
 	@echo "   - build_FordFulkerson : pour compiler le programme et créér FordFulkerson.native"
 	@echo "   - demo_FordFulkerson GRAPH=\"chemin\" ORIGIN=\"origine\" DESTINATION=\"destination\""
-	@echo "        Pour compiler le programme l'executer sur le graphe donné (ex ./graphs/graph1) entre l'origine et la destination donnée (ex 0 et 5)"
+	@echo "        Pour compiler le programme l'executer sur le graphe donné (ex ./graphs/flot/graph1) entre l'origine et la destination donnée (ex 0 et 5)"
 	@echo "        Cela charge le graphe, l'exporte au format svg, applique FordFulkerson, exporte le résultat au format svg, et l'affiche dans Firefox\n"
+	@echo "En ce qui concerne Ford Fulkerson avec prise en compte du cout, il a été codé dans le module flotcost, et, peut être lancé grace au fichier FordFulkersonCost.ml"
+	@echo "Pour simplifier son utilisation, la aussi, des cibles ont été créées : "
+	@echo "   - build_FordFulkersonCost : pour compiler le programme et créér FordFulkersonCost.native"
+	@echo "   - demo_FordFulkersonCost GRAPH=\"chemin\" ORIGIN=\"origine\" DESTINATION=\"destination\""
+	@echo "        Pour compiler le programme l'executer sur le graphe donné (ex ./graphs.flotcost/graph1) entre l'origine et la destination donnée (ex 0 et 5)"
+	@echo "        Cela charge le graphe, l'exporte au format svg, applique FordFulkersonCost, exporte le résultat au format svg, et l'affiche dans Firefox\n"
 	@echo "En ce qui concerne l'affectation d'emploi, elle a été codée dans le module emploifile, et, peut être lancé grace au fichier emploifiletest.ml"
 	@echo "Pour simplifier son utilisation, la aussi, des cibles ont été créées : "
 	@echo "   - build_Emploi : pour compiler le programme et créér emploifiletest.native"
@@ -63,6 +69,24 @@ else
 	firefox $(GRAPH)output_from_$(ORIGIN)_to_$(DESTINATION).svg
 endif
 
+build_FordFulkersonCost: 
+	@echo "\n==== COMPILING FordFulkersonCost ====\n"
+	ocamlbuild FordFulkersonCost.native
+
+demo_FordFulkersonCost: build_FordFulkersonCost
+ifeq ($(GRAPH),null)
+	@echo "USAGE : make demo_FordFulkersonCost GRAPH=\"chemin\" ORIGIN=\"origine\" DESTINATION=\"destination\""
+else ifeq ($(ORIGIN),-1)
+	@echo "USAGE : make demo_FordFulkersonCost GRAPH=\"chemin\" ORIGIN=\"origine\" DESTINATION=\"destination\""
+else ifeq ($(DESTINATION),-1)
+	@echo "USAGE : make demo_FordFulkersonCost GRAPH=\"chemin\" ORIGIN=\"origine\" DESTINATION=\"destination\""
+else
+	./FordFulkersonCost.native $(GRAPH) $(ORIGIN) $(DESTINATION) $(GRAPH).dot $(GRAPH)output_from_$(ORIGIN)_to_$(DESTINATION).dot
+	dot -Tsvg $(GRAPH).dot > $(GRAPH).svg
+	dot -Tsvg $(GRAPH)output_from_$(ORIGIN)_to_$(DESTINATION).dot > $(GRAPH)output_from_$(ORIGIN)_to_$(DESTINATION).svg
+	firefox $(GRAPH)output_from_$(ORIGIN)_to_$(DESTINATION).svg
+endif
+
 build_Emploi: 
 	@echo "\n==== COMPILING Emploi ====\n"
 	ocamlbuild emploifiletest.native
@@ -83,8 +107,6 @@ edit:
 	code . -n
 
 clean:
-	-rm -rf _build/
-	-rm *.native
-	-rm graphs/*.dot
-	-rm emplois/*.dot
+	@rm -rf _build/
+	@rm *.native graphs/*/*.dot emplois/*.dot
 

graphs/graph1 → graphs/flot/graph1

@@ -12,13 +12,13 @@ n 535 294    % This is node #5.
 
 %% Edges
 
-e 3 1 11     % An edge from 3 to 1, labeled "11".
-e 3 2 2
-e 1 5 21
-e 4 5 14
-e 1 4 1
-e 0 1 7
-e 0 3 10
-e 3 4 5
-e 2 4 12
-e 0 2 8
+e 3 1 (0/11)     % An edge from 3 to 1, labeled "11".
+e 3 2 (0/2)
+e 1 5 (0/21)
+e 4 5 (0/14)
+e 1 4 (0/1)
+e 0 1 (0/7)
+e 0 3 (0/10)
+e 3 4 (0/5)
+e 2 4 (0/12)
+e 0 2 (0/8)

graphs/flot/graph2

@@ -0,0 +1,25 @@
+% Graph saved at Sun Nov 22 2020 11:38:03 GMT+0100 (heure normale d’Europe centrale)
+n 23 266
+n 177 436
+n 175 268
+n 329 269
+n 483 437
+n 481 335
+n 175 130
+n 646 268
+e 3 5 (0/8)
+e 3 4 (0/20)
+e 4 5 (0/1)
+e 2 3 (0/26)
+e 1 4 (0/13)
+e 1 3 (0/10)
+e 0 2 (0/1)
+e 0 1 (0/38)
+e 1 2 (0/8)
+e 4 7 (0/7)
+e 5 7 (0/7)
+e 3 7 (0/1)
+e 6 7 (0/27)
+e 3 6 (0/24)
+e 0 6 (0/2)
+e 4 2 (0/2)

graphs/flotcost/graph1

@@ -0,0 +1,24 @@
+%% Test graph #1
+
+%% Nodes
+
+n 88 209     % This is node #0, with its coordinates (which are not used by the algorithms).
+n 408 183
+n 269 491
+n 261 297
+n 401 394
+n 535 294    % This is node #5.
+
+
+%% Edges
+
+e 3 1 (0/11):0    % An edge from 3 to 1, labeled "11".
+e 3 2 (0/2):0
+e 1 5 (0/21):0
+e 4 5 (0/14):0
+e 1 4 (0/1):0
+e 0 1 (0/7):0
+e 0 3 (0/10):0
+e 3 4 (0/5):0
+e 2 4 (0/12):0
+e 0 2 (0/8):0

graphs/flotcost/graph2

@@ -0,0 +1,25 @@
+% Graph saved at Sun Nov 22 2020 11:38:03 GMT+0100 (heure normale d’Europe centrale)
+n 23 266
+n 177 436
+n 175 268
+n 329 269
+n 483 437
+n 481 335
+n 175 130
+n 646 268
+e 3 5 (0/8):10
+e 3 4 (0/20):2
+e 4 5 (0/1):6
+e 2 3 (0/26):1
+e 1 4 (0/13):5
+e 1 3 (0/10):7
+e 0 2 (0/1):9
+e 0 1 (0/38):4
+e 1 2 (0/8):1
+e 4 7 (0/7):8
+e 5 7 (0/7):20
+e 3 7 (0/1):100
+e 6 7 (0/27):10
+e 3 6 (0/24):5
+e 0 6 (0/2):4
+e 4 2 (0/2):2

graphs/flotcost/graph2.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
+ -->
+<!-- Title: finite_state_machine Pages: 1 -->
+<svg width="576pt" height="168pt"
+ viewBox="0.00 0.00 576.00 167.66" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(.7451 .7451) rotate(0) translate(4 221)">
+<title>finite_state_machine</title>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-221 769,-221 769,4 -4,4"/>
+<!-- 0 -->
+<g id="node1" class="node">
+<title>0</title>
+<ellipse fill="none" stroke="#000000" cx="18" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="18" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">0</text>
+</g>
+<!-- 1 -->
+<g id="node2" class="node">
+<title>1</title>
+<ellipse fill="none" stroke="#000000" cx="134.5" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="134.5" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
+</g>
+<!-- 0&#45;&gt;1 -->
+<g id="edge5" class="edge">
+<title>0&#45;&gt;1</title>
+<path fill="none" stroke="#000000" d="M36.2031,-170C54.9263,-170 84.3483,-170 106.1283,-170"/>
+<polygon fill="#000000" stroke="#000000" points="106.4247,-173.5001 116.4247,-170 106.4247,-166.5001 106.4247,-173.5001"/>
+<text text-anchor="middle" x="76" y="-173.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/38):4</text>
+</g>
+<!-- 2 -->
+<g id="node3" class="node">
+<title>2</title>
+<ellipse fill="none" stroke="#000000" cx="248" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="248" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">2</text>
+</g>
+<!-- 0&#45;&gt;2 -->
+<g id="edge6" class="edge">
+<title>0&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M33.24,-179.5937C39.4596,-183.0898 46.8591,-186.7364 54,-189 96.0798,-202.339 108.9716,-200.1853 153,-197 177.6373,-195.2176 184.3578,-196.1568 208,-189 212.8933,-187.5187 217.9435,-185.525 222.7389,-183.3849"/>
+<polygon fill="#000000" stroke="#000000" points="224.586,-186.3809 232.0923,-178.9039 221.5616,-180.068 224.586,-186.3809"/>
+<text text-anchor="middle" x="134.5" y="-202.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1):9</text>
+</g>
+<!-- 6 -->
+<g id="node7" class="node">
+<title>6</title>
+<ellipse fill="none" stroke="#000000" cx="489" cy="-18" rx="18" ry="18"/>
+<text text-anchor="middle" x="489" y="-14.3" font-family="Times,serif" font-size="14.00" fill="#000000">6</text>
+</g>
+<!-- 0&#45;&gt;6 -->
+<g id="edge4" class="edge">
+<title>0&#45;&gt;6</title>
+<path fill="none" stroke="#000000" d="M21.3995,-152.2335C30.8372,-108.8434 61.6242,-1 134.5,-1 134.5,-1 134.5,-1 368.5,-1 400.5227,-1 436.8671,-6.9593 461.1901,-11.8213"/>
+<polygon fill="#000000" stroke="#000000" points="460.6433,-15.2823 471.1455,-13.8848 462.064,-8.4279 460.6433,-15.2823"/>
+<text text-anchor="middle" x="248" y="-4.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/2):4</text>
+</g>
+<!-- 1&#45;&gt;2 -->
+<g id="edge13" class="edge">
+<title>1&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M152.7357,-170C170.7721,-170 198.6359,-170 219.5779,-170"/>
+<polygon fill="#000000" stroke="#000000" points="219.8096,-173.5001 229.8095,-170 219.8095,-166.5001 219.8096,-173.5001"/>
+<text text-anchor="middle" x="189.5" y="-173.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/8):1</text>
+</g>
+<!-- 3 -->
+<g id="node4" class="node">
+<title>3</title>
+<ellipse fill="none" stroke="#000000" cx="368.5" cy="-110" rx="18" ry="18"/>
+<text text-anchor="middle" x="368.5" y="-106.3" font-family="Times,serif" font-size="14.00" fill="#000000">3</text>
+</g>
+<!-- 1&#45;&gt;3 -->
+<g id="edge14" class="edge">
+<title>1&#45;&gt;3</title>
+<path fill="none" stroke="#000000" d="M150.13,-161.0292C167.9089,-151.2583 198.0988,-135.9624 226,-128 264.4851,-117.0172 310.7245,-112.7305 339.8686,-111.0607"/>
+<polygon fill="#000000" stroke="#000000" points="340.3392,-114.5415 350.1495,-110.5403 339.9853,-107.5504 340.3392,-114.5415"/>
+<text text-anchor="middle" x="248" y="-131.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/10):7</text>
+</g>
+<!-- 4 -->
+<g id="node5" class="node">
+<title>4</title>
+<ellipse fill="none" stroke="#000000" cx="489" cy="-173" rx="18" ry="18"/>
+<text text-anchor="middle" x="489" y="-169.3" font-family="Times,serif" font-size="14.00" fill="#000000">4</text>
+</g>
+<!-- 1&#45;&gt;4 -->
+<g id="edge15" class="edge">
+<title>1&#45;&gt;4</title>
+<path fill="none" stroke="#000000" d="M149.9862,-179.5295C156.297,-183.0168 163.7935,-186.6741 171,-189 194.5076,-196.5871 201.3627,-195.2176 226,-197 324.9521,-204.1588 351.7778,-206.7637 449,-187 453.5018,-186.0849 458.187,-184.7833 462.6985,-183.3383"/>
+<polygon fill="#000000" stroke="#000000" points="463.8681,-186.6372 472.1584,-180.0401 461.5636,-180.0274 463.8681,-186.6372"/>
+<text text-anchor="middle" x="310" y="-205.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/13):5</text>
+</g>
+<!-- 2&#45;&gt;3 -->
+<g id="edge16" class="edge">
+<title>2&#45;&gt;3</title>
+<path fill="none" stroke="#000000" d="M262.8134,-159.4744C270.1945,-154.4644 279.3674,-148.5824 288,-144 305.3679,-134.7806 325.7838,-126.1815 341.7095,-119.9377"/>
+<polygon fill="#000000" stroke="#000000" points="343.3722,-123.0482 351.4494,-116.1919 340.8595,-116.5147 343.3722,-123.0482"/>
+<text text-anchor="middle" x="310" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/26):1</text>
+</g>
+<!-- 3&#45;&gt;4 -->
+<g id="edge9" class="edge">
+<title>3&#45;&gt;4</title>
+<path fill="none" stroke="#000000" d="M385.6794,-115.9565C402.3502,-122.034 428.1207,-132.2257 449,-144 454.8837,-147.318 460.9327,-151.3388 466.4885,-155.3162"/>
+<polygon fill="#000000" stroke="#000000" points="464.6022,-158.2748 474.7185,-161.4232 468.7736,-152.6534 464.6022,-158.2748"/>
+<text text-anchor="middle" x="427" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/20):2</text>
+</g>
+<!-- 5 -->
+<g id="node6" class="node">
+<title>5</title>
+<ellipse fill="none" stroke="#000000" cx="623.5" cy="-110" rx="18" ry="18"/>
+<text text-anchor="middle" x="623.5" y="-106.3" font-family="Times,serif" font-size="14.00" fill="#000000">5</text>
+</g>
+<!-- 3&#45;&gt;5 -->
+<g id="edge10" class="edge">
+<title>3&#45;&gt;5</title>
+<path fill="none" stroke="#000000" d="M386.839,-110C430.764,-110 542.258,-110 595.008,-110"/>
+<polygon fill="#000000" stroke="#000000" points="595.3272,-113.5001 605.3272,-110 595.3272,-106.5001 595.3272,-113.5001"/>
+<text text-anchor="middle" x="489" y="-113.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/8):10</text>
+</g>
+<!-- 3&#45;&gt;6 -->
+<g id="edge7" class="edge">
+<title>3&#45;&gt;6</title>
+<path fill="none" stroke="#000000" d="M372.3196,-92.2531C377.0014,-74.9343 386.6789,-49.1832 405,-35 420.6866,-22.8562 442.8183,-18.7505 460.4268,-17.6042"/>
+<polygon fill="#000000" stroke="#000000" points="460.8429,-21.0914 470.708,-17.2275 460.5865,-14.0961 460.8429,-21.0914"/>
+<text text-anchor="middle" x="427" y="-38.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/24):5</text>
+</g>
+<!-- 7 -->
+<g id="node8" class="node">
+<title>7</title>
+<ellipse fill="none" stroke="#000000" cx="747" cy="-87" rx="18" ry="18"/>
+<text text-anchor="middle" x="747" y="-83.3" font-family="Times,serif" font-size="14.00" fill="#000000">7</text>
+</g>
+<!-- 3&#45;&gt;7 -->
+<g id="edge8" class="edge">
+<title>3&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M386.2912,-107.1758C424.7779,-101.2277 518.6976,-87.5819 598,-83 620.6289,-81.6926 626.338,-82.5377 649,-83 672.5577,-83.4806 699.2809,-84.6103 718.8646,-85.547"/>
+<polygon fill="#000000" stroke="#000000" points="718.7848,-89.0472 728.9445,-86.0422 719.1283,-82.0556 718.7848,-89.0472"/>
+<text text-anchor="middle" x="554.5" y="-92.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1):100</text>
+</g>
+<!-- 4&#45;&gt;2 -->
+<g id="edge1" class="edge">
+<title>4&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M470.6756,-172.7719C428.8612,-172.2514 326.174,-170.9731 276.2149,-170.3512"/>
+<polygon fill="#000000" stroke="#000000" points="276.157,-166.8503 266.1142,-170.2255 276.0698,-173.8498 276.157,-166.8503"/>
+<text text-anchor="middle" x="368.5" y="-175.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/2):2</text>
+</g>
+<!-- 4&#45;&gt;5 -->
+<g id="edge3" class="edge">
+<title>4&#45;&gt;5</title>
+<path fill="none" stroke="#000000" d="M503.1682,-161.2157C510.5427,-155.4836 519.9005,-148.8109 529,-144 550.5587,-132.602 576.7678,-123.5098 596.1108,-117.6061"/>
+<polygon fill="#000000" stroke="#000000" points="597.2117,-120.9304 605.8078,-114.737 595.2257,-114.218 597.2117,-120.9304"/>
+<text text-anchor="middle" x="554.5" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1):6</text>
+</g>
+<!-- 4&#45;&gt;7 -->
+<g id="edge2" class="edge">
+<title>4&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M507.2453,-172.2131C546.8874,-169.7899 642.7939,-160.0143 711,-121 716.9745,-117.5826 722.7331,-112.9772 727.8266,-108.2612"/>
+<polygon fill="#000000" stroke="#000000" points="730.5932,-110.446 735.2184,-100.9141 725.6585,-105.4813 730.5932,-110.446"/>
+<text text-anchor="middle" x="623.5" y="-164.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/7):8</text>
+</g>
+<!-- 5&#45;&gt;7 -->
+<g id="edge12" class="edge">
+<title>5&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M641.458,-106.6556C661.8544,-102.8571 695.3838,-96.6127 719.1732,-92.1823"/>
+<polygon fill="#000000" stroke="#000000" points="719.8302,-95.6202 729.0204,-90.3484 718.5486,-88.7385 719.8302,-95.6202"/>
+<text text-anchor="middle" x="689" y="-105.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/7):20</text>
+</g>
+<!-- 6&#45;&gt;7 -->
+<g id="edge11" class="edge">
+<title>6&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M507.1048,-16.3439C546.877,-13.5703 643.6843,-11.6152 711,-50 717.7443,-53.8457 724.0463,-59.3254 729.4332,-64.8928"/>
+<polygon fill="#000000" stroke="#000000" points="726.8824,-67.2907 736.1673,-72.3939 732.0914,-62.6145 726.8824,-67.2907"/>
+<text text-anchor="middle" x="623.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/27):10</text>
+</g>
+</g>
+</svg>

graphs/flotcost/graph2output_from_0_to_7.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
+ -->
+<!-- Title: finite_state_machine Pages: 1 -->
+<svg width="576pt" height="161pt"
+ viewBox="0.00 0.00 576.00 161.11" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(.7129 .7129) rotate(0) translate(4 222)">
+<title>finite_state_machine</title>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-222 804,-222 804,4 -4,4"/>
+<!-- 0 -->
+<g id="node1" class="node">
+<title>0</title>
+<ellipse fill="none" stroke="#000000" cx="18" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="18" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">0</text>
+</g>
+<!-- 1 -->
+<g id="node2" class="node">
+<title>1</title>
+<ellipse fill="none" stroke="#000000" cx="141.5" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="141.5" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
+</g>
+<!-- 0&#45;&gt;1 -->
+<g id="edge9" class="edge">
+<title>0&#45;&gt;1</title>
+<path fill="none" stroke="#000000" d="M36.2229,-170C56.4714,-170 89.4248,-170 113.0716,-170"/>
+<polygon fill="#000000" stroke="#000000" points="113.2024,-173.5001 123.2024,-170 113.2024,-166.5001 113.2024,-173.5001"/>
+<text text-anchor="middle" x="79.5" y="-173.8" font-family="Times,serif" font-size="14.00" fill="#000000">(28/38):4</text>
+</g>
+<!-- 2 -->
+<g id="node3" class="node">
+<title>2</title>
+<ellipse fill="none" stroke="#000000" cx="258.5" cy="-170" rx="18" ry="18"/>
+<text text-anchor="middle" x="258.5" y="-166.3" font-family="Times,serif" font-size="14.00" fill="#000000">2</text>
+</g>
+<!-- 0&#45;&gt;2 -->
+<g id="edge8" class="edge">
+<title>0&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M33.2252,-179.6411C39.4427,-183.1438 46.8447,-186.7825 54,-189 99.1276,-202.9855 112.8781,-200.4091 160,-197 184.6373,-195.2176 191.2476,-195.7819 215,-189 220.9903,-187.2896 227.2359,-184.9326 233.0636,-182.4601"/>
+<polygon fill="#000000" stroke="#000000" points="234.6712,-185.5749 242.358,-178.2835 231.802,-179.1899 234.6712,-185.5749"/>
+<text text-anchor="middle" x="141.5" y="-202.8" font-family="Times,serif" font-size="14.00" fill="#000000">(1/1):9</text>
+</g>
+<!-- 6 -->
+<g id="node7" class="node">
+<title>6</title>
+<ellipse fill="none" stroke="#000000" cx="517" cy="-18" rx="18" ry="18"/>
+<text text-anchor="middle" x="517" y="-14.3" font-family="Times,serif" font-size="14.00" fill="#000000">6</text>
+</g>
+<!-- 0&#45;&gt;6 -->
+<g id="edge7" class="edge">
+<title>0&#45;&gt;6</title>
+<path fill="none" stroke="#000000" d="M21.9607,-152.2335C32.7914,-108.8434 67.1855,-1 141.5,-1 141.5,-1 141.5,-1 389.5,-1 424.0856,-1 463.4892,-7.222 489.2227,-12.1377"/>
+<polygon fill="#000000" stroke="#000000" points="488.8716,-15.6359 499.3606,-14.1424 490.2296,-8.7689 488.8716,-15.6359"/>
+<text text-anchor="middle" x="258.5" y="-4.8" font-family="Times,serif" font-size="14.00" fill="#000000">(2/2):4</text>
+</g>
+<!-- 1&#45;&gt;2 -->
+<g id="edge10" class="edge">
+<title>1&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M159.5248,-170C178.3644,-170 208.1888,-170 230.1787,-170"/>
+<polygon fill="#000000" stroke="#000000" points="230.2619,-173.5001 240.2619,-170 230.2619,-166.5001 230.2619,-173.5001"/>
+<text text-anchor="middle" x="196.5" y="-173.8" font-family="Times,serif" font-size="14.00" fill="#000000">(8/8):1</text>
+</g>
+<!-- 3 -->
+<g id="node4" class="node">
+<title>3</title>
+<ellipse fill="none" stroke="#000000" cx="389.5" cy="-110" rx="18" ry="18"/>
+<text text-anchor="middle" x="389.5" y="-106.3" font-family="Times,serif" font-size="14.00" fill="#000000">3</text>
+</g>
+<!-- 1&#45;&gt;3 -->
+<g id="edge11" class="edge">
+<title>1&#45;&gt;3</title>
+<path fill="none" stroke="#000000" d="M157.1137,-160.9715C174.878,-151.149 205.0549,-135.8069 233,-128 276.5908,-115.8223 329.2227,-111.867 360.9908,-110.5924"/>
+<polygon fill="#000000" stroke="#000000" points="361.4322,-114.0795 371.3085,-110.2442 361.1961,-107.0835 361.4322,-114.0795"/>
+<text text-anchor="middle" x="258.5" y="-131.8" font-family="Times,serif" font-size="14.00" fill="#000000">(10/10):7</text>
+</g>
+<!-- 4 -->
+<g id="node5" class="node">
+<title>4</title>
+<ellipse fill="none" stroke="#000000" cx="517" cy="-173" rx="18" ry="18"/>
+<text text-anchor="middle" x="517" y="-169.3" font-family="Times,serif" font-size="14.00" fill="#000000">4</text>
+</g>
+<!-- 1&#45;&gt;4 -->
+<g id="edge12" class="edge">
+<title>1&#45;&gt;4</title>
+<path fill="none" stroke="#000000" d="M156.9862,-179.5295C163.297,-183.0168 170.7935,-186.6741 178,-189 201.5076,-196.5871 208.3627,-195.2176 233,-197 341.2526,-204.8317 370.57,-208.2744 477,-187 481.5047,-186.0995 486.1915,-184.8055 490.7036,-183.3635"/>
+<polygon fill="#000000" stroke="#000000" points="491.8731,-186.6624 500.1635,-180.0655 489.5687,-180.0526 491.8731,-186.6624"/>
+<text text-anchor="middle" x="327.5" y="-206.8" font-family="Times,serif" font-size="14.00" fill="#000000">(10/13):5</text>
+</g>
+<!-- 2&#45;&gt;3 -->
+<g id="edge1" class="edge">
+<title>2&#45;&gt;3</title>
+<path fill="none" stroke="#000000" d="M273.8517,-159.9613C282.0252,-154.8398 292.3566,-148.714 302,-144 321.8281,-134.3074 345.1638,-125.3551 362.7474,-119.0722"/>
+<polygon fill="#000000" stroke="#000000" points="364.0895,-122.3106 372.3658,-115.696 361.771,-115.7057 364.0895,-122.3106"/>
+<text text-anchor="middle" x="327.5" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(11/26):1</text>
+</g>
+<!-- 3&#45;&gt;4 -->
+<g id="edge4" class="edge">
+<title>3&#45;&gt;4</title>
+<path fill="none" stroke="#000000" d="M406.8513,-115.2758C424.9355,-121.1068 453.817,-131.3663 477,-144 482.9312,-147.2323 488.9985,-151.2201 494.5569,-155.1929"/>
+<polygon fill="#000000" stroke="#000000" points="492.668,-158.15 502.7798,-161.3126 496.8472,-152.5345 492.668,-158.15"/>
+<text text-anchor="middle" x="451.5" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/20):2</text>
+</g>
+<!-- 5 -->
+<g id="node6" class="node">
+<title>5</title>
+<ellipse fill="none" stroke="#000000" cx="655" cy="-110" rx="18" ry="18"/>
+<text text-anchor="middle" x="655" y="-106.3" font-family="Times,serif" font-size="14.00" fill="#000000">5</text>
+</g>
+<!-- 3&#45;&gt;5 -->
+<g id="edge3" class="edge">
+<title>3&#45;&gt;5</title>
+<path fill="none" stroke="#000000" d="M407.7489,-110C453.33,-110 572.4081,-110 626.9644,-110"/>
+<polygon fill="#000000" stroke="#000000" points="626.9745,-113.5001 636.9745,-110 626.9744,-106.5001 626.9745,-113.5001"/>
+<text text-anchor="middle" x="517" y="-113.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/8):10</text>
+</g>
+<!-- 3&#45;&gt;6 -->
+<g id="edge5" class="edge">
+<title>3&#45;&gt;6</title>
+<path fill="none" stroke="#000000" d="M393.275,-92.1949C397.922,-74.8309 407.5731,-49.0454 426,-35 443.903,-21.3539 469.4557,-17.5511 488.9285,-16.9055"/>
+<polygon fill="#000000" stroke="#000000" points="489.0607,-20.4047 499.034,-16.8292 489.0078,-13.4049 489.0607,-20.4047"/>
+<text text-anchor="middle" x="451.5" y="-38.8" font-family="Times,serif" font-size="14.00" fill="#000000">(21/24):5</text>
+</g>
+<!-- 7 -->
+<g id="node8" class="node">
+<title>7</title>
+<ellipse fill="none" stroke="#000000" cx="782" cy="-87" rx="18" ry="18"/>
+<text text-anchor="middle" x="782" y="-83.3" font-family="Times,serif" font-size="14.00" fill="#000000">7</text>
+</g>
+<!-- 3&#45;&gt;7 -->
+<g id="edge2" class="edge">
+<title>3&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M407.5388,-107.2308C447.0183,-101.3265 544.1009,-87.6599 626,-83 651.7362,-81.5357 658.2276,-82.4743 684,-83 707.5577,-83.4806 734.2809,-84.6103 753.8646,-85.547"/>
+<polygon fill="#000000" stroke="#000000" points="753.7848,-89.0472 763.9445,-86.0422 754.1283,-82.0556 753.7848,-89.0472"/>
+<text text-anchor="middle" x="582.5" y="-92.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1):100</text>
+</g>
+<!-- 4&#45;&gt;2 -->
+<g id="edge14" class="edge">
+<title>4&#45;&gt;2</title>
+<path fill="none" stroke="#000000" d="M498.8429,-172.7893C454.4603,-172.2742 340.2134,-170.9483 286.8064,-170.3285"/>
+<polygon fill="#000000" stroke="#000000" points="286.7172,-166.8273 276.6772,-170.211 286.6359,-173.8269 286.7172,-166.8273"/>
+<text text-anchor="middle" x="389.5" y="-175.8" font-family="Times,serif" font-size="14.00" fill="#000000">(2/2):2</text>
+</g>
+<!-- 4&#45;&gt;5 -->
+<g id="edge15" class="edge">
+<title>4&#45;&gt;5</title>
+<path fill="none" stroke="#000000" d="M531.145,-161.1716C538.5136,-155.4283 547.8731,-148.7588 557,-144 579.7089,-132.1594 607.4298,-122.9818 627.5865,-117.1625"/>
+<polygon fill="#000000" stroke="#000000" points="628.6814,-120.4907 637.371,-114.4292 626.798,-113.7488 628.6814,-120.4907"/>
+<text text-anchor="middle" x="582.5" y="-147.8" font-family="Times,serif" font-size="14.00" fill="#000000">(1/1):6</text>
+</g>
+<!-- 4&#45;&gt;7 -->
+<g id="edge13" class="edge">
+<title>4&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M535.1832,-172.3502C575.6433,-170.1927 675.1262,-160.9019 746,-121 751.9976,-117.6233 757.7649,-113.0332 762.8593,-108.319"/>
+<polygon fill="#000000" stroke="#000000" points="765.629,-110.5004 770.2474,-100.9651 760.6908,-105.5392 765.629,-110.5004"/>
+<text text-anchor="middle" x="655" y="-165.8" font-family="Times,serif" font-size="14.00" fill="#000000">(7/7):8</text>
+</g>
+<!-- 5&#45;&gt;7 -->
+<g id="edge16" class="edge">
+<title>5&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M672.9266,-106.7534C694.1056,-102.9179 729.5798,-96.4934 754.3011,-92.0163"/>
+<polygon fill="#000000" stroke="#000000" points="754.9484,-95.4561 764.1646,-90.23 753.7009,-88.5682 754.9484,-95.4561"/>
+<text text-anchor="middle" x="724" y="-105.8" font-family="Times,serif" font-size="14.00" fill="#000000">(1/7):20</text>
+</g>
+<!-- 6&#45;&gt;7 -->
+<g id="edge6" class="edge">
+<title>6&#45;&gt;7</title>
+<path fill="none" stroke="#000000" d="M535.0678,-16.2147C575.7163,-13.0695 676.2556,-10.2303 746,-50 752.7443,-53.8457 759.0463,-59.3254 764.4332,-64.8928"/>
+<polygon fill="#000000" stroke="#000000" points="761.8824,-67.2907 771.1673,-72.3939 767.0914,-62.6145 761.8824,-67.2907"/>
+<text text-anchor="middle" x="655" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">(23/27):10</text>
+</g>
+</g>
+</svg>

graphs/graph1.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: finite_state_machine Pages: 1 -->
-<svg width="468pt" height="155pt"
- viewBox="0.00 0.00 468.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="#ffffff" stroke="transparent" points="-4,4 -4,-151 464,-151 464,4 -4,4"/>
-<!-- 0 -->
-<g id="node1" class="node">
-<title>0</title>
-<ellipse fill="none" stroke="#000000" cx="18" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="18" y="-68.3" font-family="Times,serif" font-size="14.00" fill="#000000">0</text>
-</g>
-<!-- 1 -->
-<g id="node2" class="node">
-<title>1</title>
-<ellipse fill="none" stroke="#000000" cx="230" cy="-129" rx="18" ry="18"/>
-<text text-anchor="middle" x="230" y="-125.3" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
-</g>
-<!-- 0&#45;&gt;1 -->
-<g id="edge3" class="edge">
-<title>0&#45;&gt;1</title>
-<path fill="none" stroke="#000000" d="M33.7865,-81.2522C39.9557,-84.6211 47.1765,-88.269 54,-91 99.4559,-109.1933 111.9645,-111.5225 160,-121 173.6881,-123.7007 189.075,-125.5829 201.9295,-126.8399"/>
-<polygon fill="#000000" stroke="#000000" points="201.7645,-130.3391 212.0388,-127.7529 202.3942,-123.3675 201.7645,-130.3391"/>
-<text text-anchor="middle" x="124" y="-120.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/7)</text>
-</g>
-<!-- 2 -->
-<g id="node3" class="node">
-<title>2</title>
-<ellipse fill="none" stroke="#000000" cx="230" cy="-18" rx="18" ry="18"/>
-<text text-anchor="middle" x="230" y="-14.3" font-family="Times,serif" font-size="14.00" fill="#000000">2</text>
-</g>
-<!-- 0&#45;&gt;2 -->
-<g id="edge1" class="edge">
-<title>0&#45;&gt;2</title>
-<path fill="none" stroke="#000000" d="M33.5624,-62.5042C50.6578,-52.5764 79.2494,-37.429 106,-30 138.0931,-21.0873 176.447,-18.5552 201.9154,-17.9523"/>
-<polygon fill="#000000" stroke="#000000" points="202.0401,-21.4509 211.9857,-17.799 201.9335,-14.4517 202.0401,-21.4509"/>
-<text text-anchor="middle" x="124" y="-33.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/8)</text>
-</g>
-<!-- 3 -->
-<g id="node4" class="node">
-<title>3</title>
-<ellipse fill="none" stroke="#000000" cx="124" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="124" y="-68.3" font-family="Times,serif" font-size="14.00" fill="#000000">3</text>
-</g>
-<!-- 0&#45;&gt;3 -->
-<g id="edge2" class="edge">
-<title>0&#45;&gt;3</title>
-<path fill="none" stroke="#000000" d="M36.4638,-72C52.8034,-72 76.9,-72 95.6768,-72"/>
-<polygon fill="#000000" stroke="#000000" points="95.7478,-75.5001 105.7478,-72 95.7478,-68.5001 95.7478,-75.5001"/>
-<text text-anchor="middle" x="71" y="-75.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/10)</text>
-</g>
-<!-- 4 -->
-<g id="node5" class="node">
-<title>4</title>
-<ellipse fill="none" stroke="#000000" cx="336" cy="-77" rx="18" ry="18"/>
-<text text-anchor="middle" x="336" y="-73.3" font-family="Times,serif" font-size="14.00" fill="#000000">4</text>
-</g>
-<!-- 1&#45;&gt;4 -->
-<g id="edge8" class="edge">
-<title>1&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M245.0629,-118.54C251.3806,-114.3756 258.8975,-109.7034 266,-106 279.9421,-98.7302 296.1255,-91.9268 309.4176,-86.7392"/>
-<polygon fill="#000000" stroke="#000000" points="310.8396,-89.9428 318.9335,-83.1062 308.3428,-83.4032 310.8396,-89.9428"/>
-<text text-anchor="middle" x="283" y="-109.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1)</text>
-</g>
-<!-- 5 -->
-<g id="node6" class="node">
-<title>5</title>
-<ellipse fill="none" stroke="#000000" cx="442" cy="-108" rx="18" ry="18"/>
-<text text-anchor="middle" x="442" y="-104.3" font-family="Times,serif" font-size="14.00" fill="#000000">5</text>
-</g>
-<!-- 1&#45;&gt;5 -->
-<g id="edge9" class="edge">
-<title>1&#45;&gt;5</title>
-<path fill="none" stroke="#000000" d="M248.0836,-128.5282C280.0821,-127.5014 348.7104,-124.4359 406,-116 408.7554,-115.5943 411.6138,-115.0954 414.4607,-114.5469"/>
-<polygon fill="#000000" stroke="#000000" points="415.4575,-117.9135 424.5166,-112.4195 414.0086,-111.0651 415.4575,-117.9135"/>
-<text text-anchor="middle" x="336" y="-128.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/21)</text>
-</g>
-<!-- 2&#45;&gt;4 -->
-<g id="edge4" class="edge">
-<title>2&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M247.5773,-22.1058C262.3009,-26.0393 283.4971,-32.8836 300,-43 305.868,-46.5972 311.5868,-51.2698 316.6757,-55.9935"/>
-<polygon fill="#000000" stroke="#000000" points="314.5106,-58.7744 324.0851,-63.311 319.4295,-53.7939 314.5106,-58.7744"/>
-<text text-anchor="middle" x="283" y="-46.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/12)</text>
-</g>
-<!-- 3&#45;&gt;1 -->
-<g id="edge7" class="edge">
-<title>3&#45;&gt;1</title>
-<path fill="none" stroke="#000000" d="M140.6839,-79.438C155.0433,-85.9962 176.1987,-96.0348 194,-106 198.0407,-108.262 202.2519,-110.7888 206.31,-113.3166"/>
-<polygon fill="#000000" stroke="#000000" points="204.5111,-116.3206 214.8237,-118.7498 208.2768,-110.4198 204.5111,-116.3206"/>
-<text text-anchor="middle" x="177" y="-109.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/11)</text>
-</g>
-<!-- 3&#45;&gt;2 -->
-<g id="edge6" class="edge">
-<title>3&#45;&gt;2</title>
-<path fill="none" stroke="#000000" d="M137.2363,-59.5488C143.7245,-53.9303 151.8776,-47.5494 160,-43 173.3681,-35.5124 189.3939,-29.5925 202.7364,-25.3968"/>
-<polygon fill="#000000" stroke="#000000" points="203.7509,-28.7466 212.328,-22.527 201.7443,-22.0404 203.7509,-28.7466"/>
-<text text-anchor="middle" x="177" y="-46.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/2)</text>
-</g>
-<!-- 3&#45;&gt;4 -->
-<g id="edge5" class="edge">
-<title>3&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M142.075,-72.4263C179.0769,-73.299 263.6846,-75.2944 307.9054,-76.3374"/>
-<polygon fill="#000000" stroke="#000000" points="307.891,-79.8379 317.9707,-76.5748 308.0561,-72.8399 307.891,-79.8379"/>
-<text text-anchor="middle" x="230" y="-77.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/5)</text>
-</g>
-<!-- 4&#45;&gt;5 -->
-<g id="edge10" class="edge">
-<title>4&#45;&gt;5</title>
-<path fill="none" stroke="#000000" d="M353.5037,-82.119C370.1518,-86.9878 395.4477,-94.3856 414.7371,-100.0269"/>
-<polygon fill="#000000" stroke="#000000" points="413.8898,-103.4256 424.4703,-102.8734 415.8547,-96.7071 413.8898,-103.4256"/>
-<text text-anchor="middle" x="389" y="-100.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/14)</text>
-</g>
-</g>
-</svg>

graphs/graph1output_from_0_to_1.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: finite_state_machine Pages: 1 -->
-<svg width="480pt" height="155pt"
- viewBox="0.00 0.00 480.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,-151 476,-151 476,4 -4,4"/>
-<!-- 0 -->
-<g id="node1" 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="Times,serif" font-size="14.00">0</text>
-</g>
-<!-- 1 -->
-<g id="node2" class="node">
-<title>1</title>
-<ellipse fill="none" stroke="black" cx="242" cy="-129" rx="18" ry="18"/>
-<text text-anchor="middle" x="242" y="-125.3" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- 0&#45;&gt;1 -->
-<g id="edge10" class="edge">
-<title>0&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M33.96,-81.13C40.02,-84.56 47.19,-88.28 54,-91 101.87,-110.09 115.34,-111.57 166,-121 181.7,-123.92 199.45,-125.87 213.75,-127.12"/>
-<polygon fill="black" stroke="black" points="213.66,-130.62 223.91,-127.94 214.23,-123.65 213.66,-130.62"/>
-<text text-anchor="middle" x="130" y="-120.8" font-family="Times,serif" font-size="14.00">(7/7)</text>
-</g>
-<!-- 2 -->
-<g id="node3" class="node">
-<title>2</title>
-<ellipse fill="none" stroke="black" cx="242" cy="-18" rx="18" ry="18"/>
-<text text-anchor="middle" x="242" y="-14.3" font-family="Times,serif" font-size="14.00">2</text>
-</g>
-<!-- 0&#45;&gt;2 -->
-<g id="edge8" class="edge">
-<title>0&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M33.94,-63.58C51.89,-53.86 83.2,-38.17 112,-30 135.28,-23.39 141.91,-25.36 166,-23 181.83,-21.45 199.6,-20.24 213.86,-19.4"/>
-<polygon fill="black" stroke="black" points="214.21,-22.89 224,-18.83 213.82,-15.9 214.21,-22.89"/>
-<text text-anchor="middle" x="130" y="-33.8" font-family="Times,serif" font-size="14.00">(0/8)</text>
-</g>
-<!-- 3 -->
-<g id="node4" class="node">
-<title>3</title>
-<ellipse fill="none" stroke="black" cx="130" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="130" y="-68.3" font-family="Times,serif" font-size="14.00">3</text>
-</g>
-<!-- 0&#45;&gt;3 -->
-<g id="edge9" class="edge">
-<title>0&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M36.19,-72C53.79,-72 81.39,-72 101.93,-72"/>
-<polygon fill="black" stroke="black" points="101.93,-75.5 111.93,-72 101.93,-68.5 101.93,-75.5"/>
-<text text-anchor="middle" x="74" y="-75.8" font-family="Times,serif" font-size="14.00">(10/10)</text>
-</g>
-<!-- 4 -->
-<g id="node5" class="node">
-<title>4</title>
-<ellipse fill="none" stroke="black" cx="348" cy="-77" rx="18" ry="18"/>
-<text text-anchor="middle" x="348" y="-73.3" font-family="Times,serif" font-size="14.00">4</text>
-</g>
-<!-- 1&#45;&gt;4 -->
-<g id="edge2" class="edge">
-<title>1&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M257.28,-118.76C263.49,-114.54 270.94,-109.76 278,-106 291.89,-98.6 308.08,-91.71 321.29,-86.5"/>
-<polygon fill="black" stroke="black" points="322.65,-89.73 330.72,-82.87 320.13,-83.2 322.65,-89.73"/>
-<text text-anchor="middle" x="295" y="-109.8" font-family="Times,serif" font-size="14.00">(0/1)</text>
-</g>
-<!-- 5 -->
-<g id="node6" class="node">
-<title>5</title>
-<ellipse fill="none" stroke="black" cx="454" cy="-108" rx="18" ry="18"/>
-<text text-anchor="middle" x="454" y="-104.3" font-family="Times,serif" font-size="14.00">5</text>
-</g>
-<!-- 1&#45;&gt;5 -->
-<g id="edge3" class="edge">
-<title>1&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M260.48,-128.57C292.09,-127.6 360.76,-124.62 418,-116 420.74,-115.59 423.58,-115.08 426.4,-114.52"/>
-<polygon fill="black" stroke="black" points="427.34,-117.89 436.36,-112.34 425.85,-111.06 427.34,-117.89"/>
-<text text-anchor="middle" x="348" y="-128.8" font-family="Times,serif" font-size="14.00">(0/21)</text>
-</g>
-<!-- 2&#45;&gt;4 -->
-<g id="edge1" class="edge">
-<title>2&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M259.78,-21.94C274.34,-25.84 295.58,-32.72 312,-43 317.84,-46.66 323.51,-51.43 328.52,-56.23"/>
-<polygon fill="black" stroke="black" points="326.29,-58.95 335.78,-63.65 331.29,-54.05 326.29,-58.95"/>
-<text text-anchor="middle" x="295" y="-46.8" font-family="Times,serif" font-size="14.00">(0/12)</text>
-</g>
-<!-- 3&#45;&gt;1 -->
-<g id="edge7" class="edge">
-<title>3&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M146.86,-78.34C162.28,-84.7 186.22,-95.1 206,-106 210.05,-108.23 214.25,-110.77 218.27,-113.33"/>
-<polygon fill="black" stroke="black" points="216.39,-116.29 226.67,-118.86 220.24,-110.44 216.39,-116.29"/>
-<text text-anchor="middle" x="186" y="-109.8" font-family="Times,serif" font-size="14.00">(10/11)</text>
-</g>
-<!-- 3&#45;&gt;2 -->
-<g id="edge6" class="edge">
-<title>3&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M143.45,-59.74C149.79,-54.03 157.86,-47.52 166,-43 181.06,-34.64 199.39,-28.46 214.15,-24.34"/>
-<polygon fill="black" stroke="black" points="215.4,-27.64 224.18,-21.71 213.62,-20.87 215.4,-27.64"/>
-<text text-anchor="middle" x="186" y="-46.8" font-family="Times,serif" font-size="14.00">(0/2)</text>
-</g>
-<!-- 3&#45;&gt;4 -->
-<g id="edge5" class="edge">
-<title>3&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M148.31,-72.4C185.77,-73.27 274.58,-75.32 319.69,-76.37"/>
-<polygon fill="black" stroke="black" points="319.83,-79.87 329.91,-76.6 319.99,-72.87 319.83,-79.87"/>
-<text text-anchor="middle" x="242" y="-77.8" font-family="Times,serif" font-size="14.00">(0/5)</text>
-</g>
-<!-- 4&#45;&gt;5 -->
-<g id="edge4" class="edge">
-<title>4&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M365.71,-81.98C382.16,-86.88 407.53,-94.45 426.69,-100.16"/>
-<polygon fill="black" stroke="black" points="425.75,-103.53 436.33,-103.03 427.75,-96.82 425.75,-103.53"/>
-<text text-anchor="middle" x="401" y="-100.8" font-family="Times,serif" font-size="14.00">(0/14)</text>
-</g>
-</g>
-</svg>

graphs/graph1output_from_0_to_4.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: finite_state_machine Pages: 1 -->
-<svg width="474pt" height="155pt"
- viewBox="0.00 0.00 474.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,-151 470,-151 470,4 -4,4"/>
-<!-- 0 -->
-<g id="node1" 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="Times,serif" font-size="14.00">0</text>
-</g>
-<!-- 1 -->
-<g id="node2" class="node">
-<title>1</title>
-<ellipse fill="none" stroke="black" cx="230" cy="-129" rx="18" ry="18"/>
-<text text-anchor="middle" x="230" y="-125.3" font-family="Times,serif" font-size="14.00">1</text>
-</g>
-<!-- 0&#45;&gt;1 -->
-<g id="edge5" class="edge">
-<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 111.97,-111.48 160,-121 173.68,-123.71 189.08,-125.6 201.85,-126.87"/>
-<polygon fill="black" stroke="black" points="201.59,-130.36 211.87,-127.78 202.23,-123.39 201.59,-130.36"/>
-<text text-anchor="middle" x="124" y="-120.8" font-family="Times,serif" font-size="14.00">(1/7)</text>
-</g>
-<!-- 2 -->
-<g id="node3" class="node">
-<title>2</title>
-<ellipse fill="none" stroke="black" cx="230" cy="-18" rx="18" ry="18"/>
-<text text-anchor="middle" x="230" y="-14.3" font-family="Times,serif" font-size="14.00">2</text>
-</g>
-<!-- 0&#45;&gt;2 -->
-<g id="edge4" class="edge">
-<title>0&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M33.76,-62.87C50.57,-52.95 79.19,-37.52 106,-30 138.03,-21.01 176.38,-18.51 201.65,-17.93"/>
-<polygon fill="black" stroke="black" points="201.99,-21.43 211.94,-17.79 201.9,-14.43 201.99,-21.43"/>
-<text text-anchor="middle" x="124" y="-33.8" font-family="Times,serif" font-size="14.00">(8/8)</text>
-</g>
-<!-- 3 -->
-<g id="node4" class="node">
-<title>3</title>
-<ellipse fill="none" stroke="black" cx="124" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="124" y="-68.3" font-family="Times,serif" font-size="14.00">3</text>
-</g>
-<!-- 0&#45;&gt;3 -->
-<g id="edge6" class="edge">
-<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="Times,serif" font-size="14.00">(7/10)</text>
-</g>
-<!-- 4 -->
-<g id="node5" class="node">
-<title>4</title>
-<ellipse fill="none" stroke="black" cx="342" cy="-77" rx="18" ry="18"/>
-<text text-anchor="middle" x="342" y="-73.3" font-family="Times,serif" font-size="14.00">4</text>
-</g>
-<!-- 1&#45;&gt;4 -->
-<g id="edge3" class="edge">
-<title>1&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M245.23,-118.66C251.43,-114.42 258.89,-109.66 266,-106 281.73,-97.9 300.27,-90.72 314.98,-85.52"/>
-<polygon fill="black" stroke="black" points="316.16,-88.82 324.47,-82.26 313.88,-82.2 316.16,-88.82"/>
-<text text-anchor="middle" x="286" y="-109.8" font-family="Times,serif" font-size="14.00">(1/1)</text>
-</g>
-<!-- 5 -->
-<g id="node6" class="node">
-<title>5</title>
-<ellipse fill="none" stroke="black" cx="448" cy="-108" rx="18" ry="18"/>
-<text text-anchor="middle" x="448" y="-104.3" font-family="Times,serif" font-size="14.00">5</text>
-</g>
-<!-- 1&#45;&gt;5 -->
-<g id="edge2" class="edge">
-<title>1&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M248.06,-128.64C280.27,-127.78 352.17,-124.93 412,-116 414.74,-115.59 417.58,-115.08 420.4,-114.52"/>
-<polygon fill="black" stroke="black" points="421.34,-117.9 430.36,-112.35 419.85,-111.06 421.34,-117.9"/>
-<text text-anchor="middle" x="342" y="-128.8" font-family="Times,serif" font-size="14.00">(0/21)</text>
-</g>
-<!-- 2&#45;&gt;4 -->
-<g id="edge10" class="edge">
-<title>2&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M247.71,-21.3C263.55,-24.94 287.59,-31.8 306,-43 311.89,-46.58 317.57,-51.32 322.58,-56.12"/>
-<polygon fill="black" stroke="black" points="320.35,-58.84 329.84,-63.56 325.36,-53.96 320.35,-58.84"/>
-<text text-anchor="middle" x="286" y="-46.8" font-family="Times,serif" font-size="14.00">(10/12)</text>
-</g>
-<!-- 3&#45;&gt;1 -->
-<g id="edge7" class="edge">
-<title>3&#45;&gt;1</title>
-<path fill="none" stroke="black" d="M140.63,-79.03C154.81,-85.56 176.15,-95.79 194,-106 198.01,-108.3 202.19,-110.87 206.21,-113.44"/>
-<polygon fill="black" stroke="black" points="204.33,-116.4 214.61,-118.97 208.17,-110.55 204.33,-116.4"/>
-<text text-anchor="middle" x="177" y="-109.8" font-family="Times,serif" font-size="14.00">(0/11)</text>
-</g>
-<!-- 3&#45;&gt;2 -->
-<g id="edge9" class="edge">
-<title>3&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M137.5,-59.84C143.85,-54.15 151.92,-47.62 160,-43 173.26,-35.41 189.24,-29.44 202.48,-25.25"/>
-<polygon fill="black" stroke="black" points="203.84,-28.49 212.41,-22.26 201.83,-21.79 203.84,-28.49"/>
-<text text-anchor="middle" x="177" y="-46.8" font-family="Times,serif" font-size="14.00">(2/2)</text>
-</g>
-<!-- 3&#45;&gt;4 -->
-<g id="edge8" class="edge">
-<title>3&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M142.31,-72.4C179.77,-73.27 268.58,-75.32 313.69,-76.37"/>
-<polygon fill="black" stroke="black" points="313.83,-79.87 323.91,-76.6 313.99,-72.87 313.83,-79.87"/>
-<text text-anchor="middle" x="230" y="-77.8" font-family="Times,serif" font-size="14.00">(5/5)</text>
-</g>
-<!-- 4&#45;&gt;5 -->
-<g id="edge1" class="edge">
-<title>4&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M359.71,-81.98C376.16,-86.88 401.53,-94.45 420.69,-100.16"/>
-<polygon fill="black" stroke="black" points="419.75,-103.53 430.33,-103.03 421.75,-96.82 419.75,-103.53"/>
-<text text-anchor="middle" x="395" y="-100.8" font-family="Times,serif" font-size="14.00">(0/14)</text>
-</g>
-</g>
-</svg>

graphs/graph1output_from_0_to_5.svg

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: finite_state_machine Pages: 1 -->
-<svg width="484pt" height="155pt"
- viewBox="0.00 0.00 484.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="#ffffff" stroke="transparent" points="-4,4 -4,-151 480,-151 480,4 -4,4"/>
-<!-- 0 -->
-<g id="node1" class="node">
-<title>0</title>
-<ellipse fill="none" stroke="#000000" cx="18" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="18" y="-68.3" font-family="Times,serif" font-size="14.00" fill="#000000">0</text>
-</g>
-<!-- 1 -->
-<g id="node2" class="node">
-<title>1</title>
-<ellipse fill="none" stroke="#000000" cx="236" cy="-129" rx="18" ry="18"/>
-<text text-anchor="middle" x="236" y="-125.3" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
-</g>
-<!-- 0&#45;&gt;1 -->
-<g id="edge4" class="edge">
-<title>0&#45;&gt;1</title>
-<path fill="none" stroke="#000000" d="M33.7664,-81.3031C39.933,-84.6783 47.1574,-88.3171 54,-91 101.9765,-109.8111 115.3731,-111.3814 166,-121 179.6129,-123.5863 194.885,-125.4502 207.6823,-126.7246"/>
-<polygon fill="#000000" stroke="#000000" points="207.4787,-130.2206 217.7593,-127.6593 208.1253,-123.2506 207.4787,-130.2206"/>
-<text text-anchor="middle" x="130" y="-120.8" font-family="Times,serif" font-size="14.00" fill="#000000">(7/7)</text>
-</g>
-<!-- 2 -->
-<g id="node3" class="node">
-<title>2</title>
-<ellipse fill="none" stroke="#000000" cx="236" cy="-18" rx="18" ry="18"/>
-<text text-anchor="middle" x="236" y="-14.3" font-family="Times,serif" font-size="14.00" fill="#000000">2</text>
-</g>
-<!-- 0&#45;&gt;2 -->
-<g id="edge3" class="edge">
-<title>0&#45;&gt;2</title>
-<path fill="none" stroke="#000000" d="M33.7199,-63.0658C51.9316,-53.1756 83.1404,-37.6259 112,-30 144.0194,-21.5392 182.0987,-18.9066 207.5327,-18.1571"/>
-<polygon fill="#000000" stroke="#000000" points="207.6821,-21.6548 217.6042,-17.9397 207.531,-14.6565 207.6821,-21.6548"/>
-<text text-anchor="middle" x="130" y="-33.8" font-family="Times,serif" font-size="14.00" fill="#000000">(8/8)</text>
-</g>
-<!-- 3 -->
-<g id="node4" class="node">
-<title>3</title>
-<ellipse fill="none" stroke="#000000" cx="130" cy="-72" rx="18" ry="18"/>
-<text text-anchor="middle" x="130" y="-68.3" font-family="Times,serif" font-size="14.00" fill="#000000">3</text>
-</g>
-<!-- 0&#45;&gt;3 -->
-<g id="edge5" class="edge">
-<title>0&#45;&gt;3</title>
-<path fill="none" stroke="#000000" d="M36.4945,-72C54.2718,-72 81.3816,-72 101.8413,-72"/>
-<polygon fill="#000000" stroke="#000000" points="101.8497,-75.5001 111.8496,-72 101.8496,-68.5001 101.8497,-75.5001"/>
-<text text-anchor="middle" x="74" y="-75.8" font-family="Times,serif" font-size="14.00" fill="#000000">(10/10)</text>
-</g>
-<!-- 4 -->
-<g id="node5" class="node">
-<title>4</title>
-<ellipse fill="none" stroke="#000000" cx="344" cy="-77" rx="18" ry="18"/>
-<text text-anchor="middle" x="344" y="-73.3" font-family="Times,serif" font-size="14.00" fill="#000000">4</text>
-</g>
-<!-- 1&#45;&gt;4 -->
-<g id="edge9" class="edge">
-<title>1&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M251.0447,-118.5048C257.3595,-114.335 264.8794,-109.6684 272,-106 286.5561,-98.5011 303.5148,-91.5875 317.3161,-86.393"/>
-<polygon fill="#000000" stroke="#000000" points="318.5513,-89.668 326.728,-82.9307 316.1345,-83.0984 318.5513,-89.668"/>
-<text text-anchor="middle" x="289" y="-109.8" font-family="Times,serif" font-size="14.00" fill="#000000">(0/1)</text>
-</g>
-<!-- 5 -->
-<g id="node6" class="node">
-<title>5</title>
-<ellipse fill="none" stroke="#000000" cx="458" cy="-108" rx="18" ry="18"/>
-<text text-anchor="middle" x="458" y="-104.3" font-family="Times,serif" font-size="14.00" fill="#000000">5</text>
-</g>
-<!-- 1&#45;&gt;5 -->
-<g id="edge10" class="edge">
-<title>1&#45;&gt;5</title>
-<path fill="none" stroke="#000000" d="M254.0505,-128.6299C287.3912,-127.749 360.8144,-124.8861 422,-116 424.7562,-115.5997 427.6151,-115.1045 430.4623,-114.5581"/>
-<polygon fill="#000000" stroke="#000000" points="431.4581,-117.9251 440.5186,-112.4335 430.0111,-111.0763 431.4581,-117.9251"/>
-<text text-anchor="middle" x="344" y="-128.8" font-family="Times,serif" font-size="14.00" fill="#000000">(11/21)</text>
-</g>
-<!-- 2&#45;&gt;4 -->
-<g id="edge2" class="edge">
-<title>2&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M253.508,-22.2205C268.1893,-26.2241 289.3623,-33.1067 306,-43 312.3392,-46.7695 318.5769,-51.6864 324.1079,-56.6048"/>
-<polygon fill="#000000" stroke="#000000" points="321.951,-59.3808 331.6351,-63.6782 326.7446,-54.2796 321.951,-59.3808"/>
-<text text-anchor="middle" x="289" y="-46.8" font-family="Times,serif" font-size="14.00" fill="#000000">(9/12)</text>
-</g>
-<!-- 3&#45;&gt;1 -->
-<g id="edge8" class="edge">
-<title>3&#45;&gt;1</title>
-<path fill="none" stroke="#000000" d="M146.6839,-79.438C161.0433,-85.9962 182.1987,-96.0348 200,-106 204.0407,-108.262 208.2519,-110.7888 212.31,-113.3166"/>
-<polygon fill="#000000" stroke="#000000" points="210.5111,-116.3206 220.8237,-118.7498 214.2768,-110.4198 210.5111,-116.3206"/>
-<text text-anchor="middle" x="183" y="-109.8" font-family="Times,serif" font-size="14.00" fill="#000000">(4/11)</text>
-</g>
-<!-- 3&#45;&gt;2 -->
-<g id="edge7" class="edge">
-<title>3&#45;&gt;2</title>
-<path fill="none" stroke="#000000" d="M143.2363,-59.5488C149.7245,-53.9303 157.8776,-47.5494 166,-43 179.3681,-35.5124 195.3939,-29.5925 208.7364,-25.3968"/>
-<polygon fill="#000000" stroke="#000000" points="209.7509,-28.7466 218.328,-22.527 207.7443,-22.0404 209.7509,-28.7466"/>
-<text text-anchor="middle" x="183" y="-46.8" font-family="Times,serif" font-size="14.00" fill="#000000">(1/2)</text>
-</g>
-<!-- 3&#45;&gt;4 -->
-<g id="edge6" class="edge">
-<title>3&#45;&gt;4</title>
-<path fill="none" stroke="#000000" d="M148.2455,-72.4263C185.5965,-73.299 271.0024,-75.2944 315.6404,-76.3374"/>
-<polygon fill="#000000" stroke="#000000" points="315.7216,-79.8401 325.8007,-76.5748 315.8852,-72.8421 315.7216,-79.8401"/>
-<text text-anchor="middle" x="236" y="-77.8" font-family="Times,serif" font-size="14.00" fill="#000000">(5/5)</text>
-</g>
-<!-- 4&#45;&gt;5 -->
-<g id="edge1" class="edge">
-<title>4&#45;&gt;5</title>
-<path fill="none" stroke="#000000" d="M361.8125,-81.8438C380.2175,-86.8486 409.1877,-94.7265 430.5287,-100.5297"/>
-<polygon fill="#000000" stroke="#000000" points="429.7446,-103.9435 440.3126,-103.1903 431.5814,-97.1888 429.7446,-103.9435"/>
-<text text-anchor="middle" x="402" y="-100.8" font-family="Times,serif" font-size="14.00" fill="#000000">(14/14)</text>
-</g>
-</g>
-</svg>

graphs/graph2 → graphs/int/graph2

@@ -22,4 +22,4 @@ e 3 7 1
 e 6 7 27
 e 3 6 24
 e 0 6 2
-e 4 2 2
+e 4 2 2

src/FordFulkersonCost.ml

@@ -0,0 +1,29 @@
+open Flotcost
+open Gfile
+open Graph
+
+let () = (* Check the number of command-line arguments *)
+  if Array.length Sys.argv <> 6 then
+    begin
+      Printf.printf "\nUsage: %s infile source sink outfile outfile\n\n%!" Sys.argv.(0) ;
+      exit 0
+    end ;
+
+
+  (* Arguments are : infile(1) source-id(2) sink-id(3) outfile(4) *)
+
+  let infile = Sys.argv.(1)
+  and outfile = Sys.argv.(4)
+  and outfile_max = Sys.argv.(5)
+
+  (* These command-line arguments are not used for the moment. *)
+  and source = int_of_string Sys.argv.(2)
+  and sink = int_of_string Sys.argv.(3)
+  in
+
+  (* Open file *)
+  let graph = read_flot_graph_from_string_graph (from_file infile) in
+
+  (* NB : Constructeurs, Setteurs, et Getteurs ne seront pas testés *)
+  export outfile (export_string_graph_from_flot_graph graph);
+  export outfile_max (export_string_graph_from_flot_graph (ford_fulkerson graph source sink))

src/bellmanford.ml

@@ -0,0 +1,119 @@
+open Graph
+open Path
+
+type 'a label_BF = {
+  node: id;
+  pere: id;
+  label: 'a option
+}
+
+let get_some = function
+  | Some a -> a 
+  | None -> raise (Failure "None")
+
+let maj_label_BF id new_pere new_label l = List.map (fun lab_BF -> if lab_BF.node = id then {node = id; pere = new_pere; label = Some new_label} else lab_BF) l
+
+let rec get_label_BF id = function
+  | [] -> raise (Failure "id doesn't exist")
+  | x :: next -> if x.node = id then x.label else get_label_BF id next
+
+let rec get_pere id = function
+  | [] -> raise (Failure "id doesn't exist")
+  | x :: next -> if x.node = id then x.pere else get_pere id next
+
+let init_tb_label_BF gr src label_nul = 
+  let liste = n_fold gr (fun l id -> {node = id; pere = -1; label = None} :: l) [] in
+  maj_label_BF src (-1) label_nul liste
+
+let rec print_tb_label_BF tos = function
+  | [] -> ()
+  | x :: next -> 
+    if x.label = None then (
+      Printf.printf "(Node->%d; Pere->%d; Label->%s)\n" x.node x.pere "None";
+      print_tb_label_BF tos next
+    ) else (
+      Printf.printf "(Node->%d; Pere->%d; Label->%s)\n" x.node x.pere (tos (get_some x.label));
+      print_tb_label_BF tos next
+    )
+
+let extract = function
+  | [] -> raise (Failure "File vide")
+  | x :: next -> (x, next)
+
+let rec exist y = function 
+  | [] -> false 
+  | x :: next -> if x = y then true else (exist y next)
+
+let insert y file = if exist y file then file else List.append file [y]
+
+(*let rec bellmanFord_iterations graph src k n tb file cmp sum = 
+  if (k = n) || file = [] then (
+    Printf.printf "Sortie\n";
+    tb
+  ) else (
+    Printf.printf "On passe pour k=%d\n" k;
+    let sum_costx_and_costxy x lbl_xy tb = sum (get_some (get_label_BF x tb)) lbl_xy in
+    let test_costs x y lbl_xy tb = if get_label_BF y tb = None then true else cmp (get_some (get_label_BF y tb)) (sum_costx_and_costxy x lbl_xy tb) in
+    let perform_test_and_maj x y lbl_xy tb file = 
+      Printf.printf "perform_test_and_maj entre %d et %d\n" x y;
+      if test_costs x y lbl_xy tb then ((maj_label_BF y x (sum_costx_and_costxy x lbl_xy tb) tb), (insert y file)) else (tb, file)
+    in
+    let (x, rest_file) = extract file in
+    let (new_tb, new_file) = List.fold_left (fun (tb1, file1) (y, lbl_xy) -> perform_test_and_maj x y lbl_xy tb1 file1) (tb, rest_file) (out_arcs graph x) in
+    print_tb_label_BF (fun x -> string_of_int x) new_tb;
+    bellmanFord_iterations graph src (k + 1) n new_tb new_file cmp sum
+  )
+
+  let bellmanFord graph src label_nul cmp sum = 
+  let tb = init_tb_label_BF graph src label_nul in
+  let n = n_fold graph (fun x id -> x + 1) 0 in
+  bellmanFord_iterations graph src 0 n tb [src] cmp sum*)
+
+let rec bellmanFord_iterations graph src k n tb continue cmp sum = 
+  if (k = n) then 
+    None
+  else (
+    if continue == false then
+      Some tb
+    else (
+      let sum_costy_and_costxy y lbl_xy tb = sum (get_some (get_label_BF y tb)) (get_some lbl_xy) in
+      let test_costs x y lbl_xy tb = 
+        if get_label_BF y tb = None then 
+          false 
+        else (
+          if get_label_BF x tb = None then 
+            true 
+          else 
+            cmp (get_some (get_label_BF x tb)) (sum_costy_and_costxy y lbl_xy tb)
+        ) 
+      in
+      let perform_test_and_maj x y lbl_xy tb continue = 
+        if test_costs x y lbl_xy tb then ((maj_label_BF x y (sum_costy_and_costxy y lbl_xy tb) tb), true) else (tb, continue)
+      in
+      let (new_tb, new_continue) = n_fold graph (fun (tb1, continue1) x -> if x == src then (tb1, continue1) else n_fold graph (fun (tb2, continue2) y -> if find_arc graph y x == None then (tb2, continue2) else perform_test_and_maj x y (find_arc graph y x) tb2 continue2) (tb1, continue1)) (tb, false) in
+      bellmanFord_iterations graph src (k + 1) n new_tb new_continue cmp sum
+    )
+  )
+
+let bellmanFord graph src label_nul cmp sum = 
+  let tb = init_tb_label_BF graph src label_nul in
+  let n = n_fold graph (fun x id -> x + 1) 0 in
+  bellmanFord_iterations graph src 0 n tb true cmp sum
+
+let rec create_path graph src dest path tb = 
+  if src = dest then
+    path
+  else (
+    let pere = get_pere dest tb in
+    if pere = (-1) then 
+      empty_path
+    else
+      create_path graph src pere (new_arc_in_path path pere dest (get_some (find_arc graph pere dest))) tb
+  )
+
+let shortest_path graph src dest label_nul cmp sum = 
+  let res = bellmanFord graph src label_nul cmp sum in
+  if res = None then
+    raise (Failure "Negative cost cycle detected")
+  else
+    create_path graph src dest empty_path (get_some res)

src/bellmanford.mli

@@ -0,0 +1,10 @@
+open Graph
+open Path
+
+(* function that return the shortest path in the graph between two nodes (id) *)
+(* Required to ensure the polymorphism : 
+      - a label nul (ex : 0 for integers)
+      - a comparator (ex : > for integers)
+      - a "+" (ex : + for integers)                                            *)
+(* If no path is found return None *)
+val shortest_path: 'a graph -> id -> id -> 'a -> ('a -> 'a -> bool) -> ('a -> 'a -> 'a) -> 'a path

src/flotcost.ml

@@ -0,0 +1,45 @@
+open Graph
+open Labelflotcost
+open Tools
+open Gfile
+open Path
+open Bellmanford
+
+type flotcost_graph = label_flot_cost graph
+
+(* PRIVATE : Fonction pour calculer un graphe d'écart *)
+let calculate_ecart gr = 
+  let res = clone_nodes gr in 
+  let calculate_ecart_un_arc gr id1 id2 lbl = 
+    if get_current_flot lbl = 0 then
+      new_arc gr id1 id2 (label_ecart lbl)
+    else (
+      if get_current_flot lbl = get_capacity lbl then
+        new_arc gr id2 id1 (label_ecart_reverse lbl)
+      else 
+        new_arc (new_arc gr id2 id1 (label_ecart_reverse lbl)) id1 id2 (label_ecart lbl)
+    )
+  in 
+  e_fold gr calculate_ecart_un_arc res
+
+(* PRIVATE : Fonction pour trouver le flot minimal sur le chemin *)
+let find_minimum_flot path = get_current_flot (get_minimum_label compare_current_flot path)
+
+(* Ford Fulkerson algorithm, takes one labelflot graph, one node origin and one node destination *)
+(* Return a flot_graph where the current_flot are set to maximise the flot between origin and destination *)
+let rec ford_fulkerson gr origin destination = 
+  let gr_ecart = calculate_ecart gr in
+  let path_found = shortest_path gr_ecart origin destination new_label compare sum in 
+  if is_path_empty path_found then
+    gr 
+  else (
+    let min_change = find_minimum_flot path_found in
+    let updated_graph = update gr path_found (fun lbl -> add_current_flot lbl min_change) (fun lbl -> reduce_current_flot lbl min_change) in
+    ford_fulkerson updated_graph origin destination)
+
+
+(* Fonctions pour récupérer et écrire des graphes dans les fichiers *)
+(* NB : Pour lire un graphe de flot, le fichier ne doit contenir qu'un seul int en label (la capacité) *)
+let read_flot_graph_from_string_graph graph = gmap graph string_to_label_flot
+let export_string_graph_from_flot_graph graph = gmap graph label_flot_to_string
+

src/flotcost.mli

@@ -0,0 +1,13 @@
+open Gfile
+open Graph
+
+type flotcost_graph
+
+(* Fonctions pour récupérer et écrire des graphes dans les fichiers *)
+(* NB : Pour lire un graphe de flot, le fichier ne doit contenir qu'un seul int en label (la capacité) *)
+val read_flot_graph_from_string_graph: string graph -> flotcost_graph
+val export_string_graph_from_flot_graph:  flotcost_graph -> string graph
+
+(* Ford Fulkerson algorithm, takes one labelflot graph, one node origin and one node destination *)
+(* Return a flot_graph where the current_flot are set to maximise the flot between origin and destination *)
+val ford_fulkerson: flotcost_graph -> id -> id -> flotcost_graph 

src/labelflot.ml

@@ -37,4 +37,5 @@ let label_flot_valid label = (0 <= label.current_flot && label.current_flot <= l
 (* Convert a label_flot into a string ((1, 2) -> "(1/2)") *)
 let label_flot_to_string label = "(" ^ string_of_int label.current_flot ^ "/" ^ string_of_int label.capacity ^ ")"
 
-let string_to_label_flot label = new_label_cap (int_of_string label)
+(* Convert a string (1/2) en label flot (1, 2) *)
+let string_to_label_flot label = Scanf.sscanf label "(%d/%d)" (fun flot cap -> {current_flot = flot; capacity = cap})

src/labelflot.mli

@@ -35,4 +35,5 @@ val label_flot_valid: label_flot -> bool
 (* Convert a label_flot into a string ((1, 2) -> "(1/2)") *)
 val label_flot_to_string: label_flot -> string
 
+(* Convert a string (1/2) en label flot (1, 2) *)
 val string_to_label_flot: string -> label_flot 

src/labelflotcost.ml

@@ -0,0 +1,55 @@
+(* Type utilisé pour le label d'un graphe de flots *)
+type label_flot_cost = {
+  current_flot: int;
+  capacity: int;
+  cost: int
+}
+
+(**************  CONSTRUCTORS  **************)
+
+(* The label null (0; 0) *)
+let new_label = {current_flot = 0; capacity = 0; cost = 0}
+(* label with capacity defined *)
+let new_label_cap cap = {current_flot = 0; capacity = cap; cost = 0}
+(* label with capacity and cost defined *)
+let new_label_cap_cost cap cst = {current_flot = 0; capacity = cap; cost = cst}
+
+(**************  OPERATIONS (ACCORDING TO COST) *****************)
+
+(* compare the cost of the two given labels (>) *)
+let compare l1 l2 = l1.cost > l2.cost
+(* sum the cost of the two given labels *)
+let sum l1 l2 = {l1 with cost = l1.cost + l2.cost}
+
+(**************  GETTERS  *****************)
+
+let get_current_flot label = label.current_flot
+let get_capacity label = label.capacity
+let get_cost label = label.cost
+
+(**************  SETTERS  *****************)
+
+let set_current_flot label fl = { label with current_flot = fl }
+let set_capacity label cap = { label with capacity = cap }
+let add_current_flot label fl = { label with current_flot = (get_current_flot label) + fl }
+let reduce_current_flot label fl = { label with current_flot = (get_current_flot label) - fl }
+let set_cost label cst = { label with cost = cst }
+
+(**************  SOME OTHER FUNCTIONS ***************)
+
+(* Compare two label_flot return true if the current_flot of the first argument is lower than the current_flot of the second one *)
+let compare_current_flot lbl1 lbl2 = (lbl1.current_flot < lbl2.current_flot)
+
+(* Return the ecart to the capacity ((1, 6) -> (5, 6)) *)
+let label_ecart label = { label with current_flot = (label.capacity - label.current_flot) }
+
+(* Return the same label with oposite cost *)
+let label_ecart_reverse label = {label with cost = (- label.cost)}
+
+(* Check if a given label_flot is valid (0 <= current_flot <= capacity) *)
+let label_flot_valid label = (0 <= label.current_flot && label.current_flot <= label.capacity)
+
+(* Convert a label_flot into a string ((1, 2) -> "(1/2)") *)
+let label_flot_to_string label = "(" ^ string_of_int label.current_flot ^ "/" ^ string_of_int label.capacity ^ "):"^ string_of_int label.cost 
+
+let string_to_label_flot label = Scanf.sscanf label "(%d/%d):%d" (fun flot cap cst -> {current_flot = flot; capacity = cap; cost = cst})

src/labelflotcost.mli

@@ -0,0 +1,52 @@
+
+(* Types utilisés pour le label d'un graphe de flots avec cout*)
+type label_flot_cost
+
+(**************  CONSTRUCTORS  **************)
+
+(* The label null (0; 0; 0) *)
+val new_label: label_flot_cost
+(* label with capacity defined *)
+val new_label_cap: int -> label_flot_cost
+(* label with capacity and cost defined *)
+val new_label_cap_cost: int -> int -> label_flot_cost
+
+(**************  OPERATIONS (ACCORDING TO COST) *****************)
+
+(* compare the cost of the two given labels (>) *)
+val compare: label_flot_cost -> label_flot_cost -> bool
+(* sum the cost of the two given labels *)
+val sum: label_flot_cost -> label_flot_cost -> label_flot_cost
+
+(**************  GETTERS  *****************)
+
+val get_current_flot: label_flot_cost -> int
+val get_capacity: label_flot_cost -> int
+val get_cost: label_flot_cost -> int
+
+(**************  SETTERS  *****************)
+
+val set_current_flot: label_flot_cost -> int -> label_flot_cost
+val add_current_flot: label_flot_cost -> int -> label_flot_cost
+val reduce_current_flot: label_flot_cost -> int -> label_flot_cost
+val set_capacity: label_flot_cost -> int -> label_flot_cost
+val set_cost: label_flot_cost -> int -> label_flot_cost
+
+(**************  SOME OTHER FUNCTIONS ***************)
+
+(* Compare two label_flot return true if the current_flot of the first argument is lower than the current_flot of the second one *)
+val compare_current_flot: label_flot_cost -> label_flot_cost -> bool
+
+(* Return the ecart to the capacity ((1, 6, x) -> (5, 6, x)) *)
+val label_ecart: label_flot_cost -> label_flot_cost
+
+(* Return the same label with oposite cost *)
+val label_ecart_reverse: label_flot_cost -> label_flot_cost
+
+(* Check if a given label_flot is valid (0 <= current_flot <= capacity) *)
+val label_flot_valid: label_flot_cost -> bool
+
+(* Convert a label_flot into a string ((1, 2, 3) -> "(1/2):3") *)
+val label_flot_to_string: label_flot_cost -> string
+
+val string_to_label_flot: string -> label_flot_cost

src/tools.ml

@@ -53,9 +53,9 @@ let findWay g id1 id2 =
   let s = [id1] in(*file de l'algo, qui commence avec le noeud de départ*)
   let (isFound,res,a) = loop_findWay g id2 id1 s in
   res
-  (* if not isFound then (Printf.printf "Rien trouvé\n"; 
-                       res)
-  else (Printf.printf "Trouvé un truc\n"; res) *)
+(* if not isFound then (Printf.printf "Rien trouvé\n"; 
+                     res)
+   else (Printf.printf "Trouvé un truc\n"; res) *)
 
 let rec isValid g f = e_fold g (fun acu id1 id2 info -> if (f info) then (true && acu) else false) true 
 

src/toolstest.ml

@@ -7,7 +7,7 @@ open Path
 
 let () = 
   (* Open file *)
-  let graph = from_file "graphs/tests/graph1" in
+  let graph = from_file "graphs/int/graph1" in
 
   (* NB : Constructeurs, Setteurs, et Getteurs ne seront pas testés *)
   let () =