Correction of new tiles generation

SevillanoRobin · Dec 7, 2019 · 94ad2b9 · 94ad2b9
1 parent 1211631
commit 94ad2b9
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 210 deletions.
diff --git a/src/application/Main_Terminal.java b/src/application/Main_Terminal.java
@@ -69,7 +69,7 @@ public static void main(final String[] args) {
                         break;
                     case "l":
                     case "load":
-                        System.out.print("Saisir le chemin de la sauvegarde : \t\t");
+                        System.out.print("Saisir le chemin de la sauvegarde : \t");
                         g.load(sc.nextLine());
                         break;
                     default:

diff --git a/src/model/Etat.java b/src/model/Etat.java
@@ -28,68 +28,80 @@ public class Etat {
     private int scoreMax;
     private int scoreGrid;
 
-    public Etat() {    //constructeurs
-    }
+    public Etat() {}
     public Etat(Grids ensemble, String deplacement) {
         this.ensemble = new Grids(ensemble);
         this.deplacement = deplacement;
         this.scoreMax = ensemble.best();
         this.scoreGrid = ensemble.scoreTotalGrille();
     }
 
+
     public Etat(Etat ee) {
         this.ensemble = new Grids(ee.getGrids());
         this.deplacement = ee.getDeplacement();
         this.scoreMax = ee.getScoreMax();
         this.scoreGrid = ee.getScoreGrid();
     }
 
+
     /*public String toString() {
         return "Ensemble grille : " + this.ensemble + " deplacmeent : " + this.deplacement + " score Max : " + this.scoreMax + " score Grid : " + this.scoreGrid;
     }*/
 
+
     //getteurs et setteurs
     public Grids getGrids() {
         return this.ensemble;
     }
 
+
     public String getDeplacement() {
         return this.deplacement;
     }
 
+
     public int getScoreMax() {
         return this.scoreMax;
     }
 
+
     private int getScoreGrid() {
         return this.scoreGrid;
     }
+
 
     public void setEnsembleGrile(Grids ensemble) {
         this.ensemble = ensemble;
     }
 
+
     public void setDeplacement(String dep) {
         this.deplacement = dep;
     }
+
 
     public void setScoreMax(int _scoreMax) {
         this.scoreMax = _scoreMax;
     }
 
+
     //méthodes
     public boolean estbut(Probleme pb) { //teste si l'état est égal à l'état but du problème
         return (pb.getGrids().best() == GOAL);
     }
+
 
     public boolean estegal(Etat e) {
         return this.ensemble == e.getGrids() && this.deplacement.equals(e.getDeplacement());
     }
 
+
     /*public void affiche() {
         System.out.println(this.ensemble + " " + this.deplacement + " " + this.scoreMax);
     }*/
 
+
     // applique une action a à l'état courant. Le probleme est passé en paramètre pour connaitre la contenance maximale de chaque cruche
     public Etat AppliqueAction(Action a, Grids grids) {
         Etat e;
@@ -145,43 +157,44 @@ public Etat AppliqueAction(Action a, Grids grids) {
         return (e);
     }
 
+
     private boolean valide(String direction) {
         boolean valide = false;
         int indice = 0;
         if (direction.equals("d")) {
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.right2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.right(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         } else if (direction.equals("q")) {
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.left2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.left(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         } else if (direction.equals("z")) {
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.up2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.up(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         } else if (direction.equals("s")) {
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.down2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.down(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         } else if (direction.equals("r")) {
             this.ensemble.reorganization(this.ensemble.getGrids());
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.down2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.down(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         } else {
             this.ensemble.reorganization(this.ensemble.getGrids());
             while (!valide && indice < this.ensemble.getGrids().length) {
-                valide = this.ensemble.up2(this.ensemble.getGrids()[indice]);
+                valide = this.ensemble.up(this.ensemble.getGrids()[indice]);
                 indice++;
             }
         }
         return valide;
     }
 
-} // fin classe
+}
diff --git a/src/model/Grid.java b/src/model/Grid.java
@@ -11,6 +11,8 @@
 package model;
 import java.io.Serializable;
 
+
+@SuppressWarnings("serial")
 public class Grid extends Movable implements Serializable{
 
 	/**
@@ -56,16 +58,16 @@ public boolean lose() {
 
 		Tile[] tampon = copy();
 
-		control[0] = left(true, this);
+		control[0] = left(this);
 		override(tampon);
 
-		control[1] = right(true, this);
+		control[1] = right(this);
 		override(tampon);
 
-		control[2] = up(true, this);
+		control[2] = up(this);
 		override(tampon);
 
-		control[3] = down(true, this);
+		control[3] = down(this);
 		override(tampon);
 
 		for (boolean b: control) {
@@ -137,16 +139,16 @@ public boolean move(int _d) {
 		switch (_d) {
 
 			case LEFT:
-				return left(false, this);
+				return left(this);
 
 			case RIGHT:
-				return right(false, this);
+				return right(this);
 
 			case UP:
-				return up(false, this);
+				return up(this);
 
 			case DOWN:
-				return down(false, this);
+				return down(this);
 
 			default:
 				System.out.println("Erreur de déplacement");

diff --git a/src/model/Grids.java b/src/model/Grids.java
@@ -18,6 +18,7 @@
 import java.io.Serializable;
 import java.util.Calendar;
 
+@SuppressWarnings("serial")
 public class Grids extends Movable implements Serializable {
 
 	private Grid grids[];
@@ -122,7 +123,7 @@ public boolean move(int _d) {
 			if(_d == FRONT) {
 				Grid tamp[] = reorganization(this.grids);
 				verif[index] = tamp[index].move(DOWN);
-				//on remet la matrice dans le bon sens
+				//on remet la matrice dans le bon sens 
 				setGrids(reorganization(reorganization(reorganization(tamp))));
 			}
 			else if(_d == BACK) {
@@ -138,20 +139,23 @@ else if(_d == BACK) {
 
         for (boolean b : verif) {
             if (b) {
+            	newTile(getGrids());
                 victory();
                 lose();
                 this.affichage();
                 return true;
             }
         }
+
         return false;
     }
 
+
     public Grid[] getGrids() {
         return this.grids;
-
     }
 
+
 	private void setGrids(Grid[] _gs) {
 		this.grids =_gs;
 	}