diff --git a/slides/cours_27.md b/slides/cours_27.md index f0f04c39d2960579d6659238d9b895f7746075b1..7c81aa7dd8fbe6f458be4e14adc8036aaab9ed12 100644 --- a/slides/cours_27.md +++ b/slides/cours_27.md @@ -730,48 +730,48 @@ O(|V|) u, fp = défiler(file_priorité) ## Mise à jour * Tant qu'il reste plus d'un $V_i$: - * Pour $(u,v)\in A$ à poids minimal: - * Retirer $(u,v)$ de $A$, + * Pour $(u,v)\in E$ à poids minimal: + * Retirer $(u,v)$ de $E$, * Si $u\in V_i$ et $v\in V_j$ avec $V_i\cap V_j=\emptyset$: * Ajouter $(u,v)$ à $A$; * Fusionner $U$ et $V$ dans $F$. -<!-- # Algorithme de Kruskal: exemple --> -<!----> -<!-- ::: columns --> -<!----> -<!-- :::: column --> -<!----> -<!--  --> -<!----> -<!-- :::: --> -<!----> -<!-- :::: column --> -<!----> -<!-- :::: --> -<!----> -<!-- ::: --> -<!----> -<!-- # Algorithme de Kruskal: solution --> -<!----> -<!--  --> -<!----> -<!-- # Algorithme de Kruskal: exercice --> -<!----> -<!-- ::: columns --> -<!----> -<!-- :::: column --> -<!----> -<!--  --> -<!----> -<!-- :::: --> -<!----> -<!-- :::: column --> -<!----> -<!-- :::: --> -<!----> -<!-- ::: --> -<!----> -<!-- # Algorithme de Kruskal: solution --> -<!----> -<!--  --> +# Algorithme de Kruskal: exemple + +::: columns + +:::: column + + + +:::: + +:::: column + +:::: + +::: + +# Algorithme de Kruskal: solution + + + +# Algorithme de Kruskal: exercice + +::: columns + +:::: column + + + +:::: + +:::: column + +:::: + +::: + +# Algorithme de Kruskal: solution + + diff --git a/slides/figs/kruskal_0.png b/slides/figs/kruskal_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c413e3d52420a86b4323bef5baf0b4a2b987f0bb Binary files /dev/null and b/slides/figs/kruskal_0.png differ diff --git a/slides/figs/kruskal_1.png b/slides/figs/kruskal_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7a0da02fa35abb08fca7770b7873f558e7938aa7 Binary files /dev/null and b/slides/figs/kruskal_1.png differ diff --git a/slides/figs/kruskal_2.png b/slides/figs/kruskal_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5cfe459bea24b3a3b0146f672f191ff4d7f51e16 Binary files /dev/null and b/slides/figs/kruskal_2.png differ diff --git a/slides/figs/kruskal_3.png b/slides/figs/kruskal_3.png new file mode 100644 index 0000000000000000000000000000000000000000..66c03316704961ca8bd53ad66adac079f167891b Binary files /dev/null and b/slides/figs/kruskal_3.png differ diff --git a/slides/figs/kruskal_4.png b/slides/figs/kruskal_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6741560c2475044005295b7b68a5cdcbf9913e Binary files /dev/null and b/slides/figs/kruskal_4.png differ diff --git a/slides/figs/kruskal_cycle.png b/slides/figs/kruskal_cycle.png new file mode 100644 index 0000000000000000000000000000000000000000..4c16b2f010793b7ff1944b6fb04da43e9863ef54 Binary files /dev/null and b/slides/figs/kruskal_cycle.png differ diff --git a/slides/figs/kruskal_enonce.png b/slides/figs/kruskal_enonce.png new file mode 100644 index 0000000000000000000000000000000000000000..294a9a388afdd8cf77d3073da007bcce6bb05b80 Binary files /dev/null and b/slides/figs/kruskal_enonce.png differ diff --git a/slides/figs/kruskal_exercice.png b/slides/figs/kruskal_exercice.png new file mode 100644 index 0000000000000000000000000000000000000000..14e76d51d3a59a7ff165433f72c834d3b76d40c3 Binary files /dev/null and b/slides/figs/kruskal_exercice.png differ diff --git a/slides/figs/kruskal_solution.png b/slides/figs/kruskal_solution.png new file mode 100644 index 0000000000000000000000000000000000000000..54e42c6b94896b27ca4017c2b1b7a1d61e32b0e1 Binary files /dev/null and b/slides/figs/kruskal_solution.png differ diff --git a/slides/figs/kruskal_solution_exercice.png b/slides/figs/kruskal_solution_exercice.png new file mode 100644 index 0000000000000000000000000000000000000000..63dc3ca82e18f05cda5b575e08e436661d577777 Binary files /dev/null and b/slides/figs/kruskal_solution_exercice.png differ