diff --git a/Nim/MainNim.java b/Nim/MainNim.java index 5d63562..974d558 100644 --- a/Nim/MainNim.java +++ b/Nim/MainNim.java @@ -5,7 +5,14 @@ import fr.iut_fbleau.raw_api_body.entity.Plateau; public class MainNim { public static void main(String[] args) { - Plateau p = new PlateauNim(6); + + + Plateau p = new PlateauNim(5); System.out.println(MinMax.ExploreMax(p)); + + + + } + } diff --git a/Nim/PlateauNim.java b/Nim/PlateauNim.java index 7741e1c..8aff46c 100644 --- a/Nim/PlateauNim.java +++ b/Nim/PlateauNim.java @@ -9,6 +9,13 @@ public class PlateauNim implements Plateau { int allumette; Player currrentPlayer; Result resultat; + PlyNim j1_1 = new PlyNim(1,Player.JOUEUR1); + PlyNim j1_2 = new PlyNim(2,Player.JOUEUR1); + PlyNim j1_3 = new PlyNim(3,Player.JOUEUR1); + + PlyNim j2_1 = new PlyNim(1,Player.JOUEUR2); + PlyNim j2_2 = new PlyNim(2,Player.JOUEUR2); + PlyNim j2_3 = new PlyNim(3,Player.JOUEUR2); public PlateauNim(int allumette) { this.allumette = allumette; @@ -37,17 +44,31 @@ public class PlateauNim implements Plateau { public Iterator givePlies() { ArrayList plies = new ArrayList(); - if (allumette == 1) { - plies.add(new PlyNim(1, currrentPlayer)); - } else if (allumette == 2) { - plies.add(new PlyNim(1, currrentPlayer)); - plies.add(new PlyNim(2, currrentPlayer)); + if (currrentPlayer == Player.JOUEUR1){ + if (allumette == 1) { + plies.add(j1_1); + } else if (allumette == 2) { + plies.add(j1_1); + plies.add(j1_2); + } else { + plies.add(j1_1); + plies.add(j1_2); + plies.add(j1_3); + } } else { - plies.add(new PlyNim(1, currrentPlayer)); - plies.add(new PlyNim(2, currrentPlayer)); - plies.add(new PlyNim(3, currrentPlayer)); + if (allumette == 1) { + plies.add(j2_1); + } else if (allumette == 2) { + plies.add(j2_1); + plies.add(j2_2); + } else { + plies.add(j2_1); + plies.add(j2_2); + plies.add(j2_3); + } } + return plies.iterator(); } diff --git a/out/production/5.5-9Octobre/Nim/MainNim.class b/out/production/5.5-9Octobre/Nim/MainNim.class index 4a64a73..8b9da91 100644 Binary files a/out/production/5.5-9Octobre/Nim/MainNim.class and b/out/production/5.5-9Octobre/Nim/MainNim.class differ diff --git a/out/production/5.5-9Octobre/Nim/PlateauNim.class b/out/production/5.5-9Octobre/Nim/PlateauNim.class index 1156201..38b28c2 100644 Binary files a/out/production/5.5-9Octobre/Nim/PlateauNim.class and b/out/production/5.5-9Octobre/Nim/PlateauNim.class differ