Cleanup the IA package sources.

- Action
- Etat
- Noeud
- Probleme

src/model/Ia/Action.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 08/12/2019
+ * Copyright (c) 09/12/2019
  *
  * Auteurs :
  *      - Behm Guillaume
@@ -18,22 +18,6 @@
 public class Action {
     private String val;
 
-
-    /**
-     * Constructeur
-     */
-    public Action() {
-    }
-
-    /**
-     * Constructeur
-     *
-     * @param act
-     */
-    public Action(String act) {
-        val = act;
-    }
-
     // getteurs et setteurs
 
     /**
@@ -50,7 +34,7 @@ public String getAction() {
      *
      * @param s
      */
-    public void setAction(String s) {
+    void setAction(String s) {
         val = s;
     }
 

src/model/Ia/Etat.java

@@ -10,6 +10,7 @@
 
 package model.Ia;
 
+import model.Grid;
 import model.Grids;
 import model.Parameters;
 
@@ -23,7 +24,6 @@ public class Etat {
     private Grids ensemble;
     private String deplacement; // lettre entree en ligne de commande
     private int scoreMax;
-    private int scoreGrid;
 
     /**
      * Constructeur
@@ -41,19 +41,17 @@ public Etat(Grids ensemble, String deplacement) {
         this.ensemble = new Grids(ensemble.getGrids());
         this.deplacement = deplacement;
         this.scoreMax = ensemble.best();
-        this.scoreGrid = ensemble.scoreTotalGrille();
     }
 
     /**
      * Fait une copie d'un etat existant
      *
      * @param ee
      */
-    public Etat(Etat ee) {
+    Etat(Etat ee) {
         this.ensemble = new Grids(ee.getGrids().getGrids());
         this.deplacement = ee.getDeplacement();
         this.scoreMax = this.ensemble.best();
-        this.scoreGrid = this.ensemble.scoreTotalGrille();
     }
 
     /**
@@ -70,7 +68,7 @@ public Grids getGrids() {
      *
      * @return
      */
-    public String getDeplacement() {
+    String getDeplacement() {
         return this.deplacement;
     }
 
@@ -84,43 +82,6 @@ public int getScoreMax() {
         return this.scoreMax;
     }
 
-    /**
-     * Getter
-     *
-     * @return
-     */
-    public int getScoreGrid() {
-        this.scoreGrid = ensemble.scoreTotalGrille();
-        return this.scoreGrid;
-    }
-
-    /**
-     * Setter
-     *
-     * @param ensemble
-     */
-    public void setEnsembleGrile(Grids ensemble) {
-        this.ensemble = ensemble;
-    }
-
-    /**
-     * Setter
-     *
-     * @param dep
-     */
-    public void setDeplacement(String dep) {
-        this.deplacement = dep;
-    }
-
-    /**
-     * Setter
-     *
-     * @param _scoreMax
-     */
-    public void setScoreMax(int _scoreMax) {
-        this.scoreMax = _scoreMax;
-    }
-
     /// --- METHODES --- ///
 
     /**
@@ -134,17 +95,6 @@ public boolean estbut(Probleme pb) { //teste si l'état est égal à l'état but
         return (pb.getGrids().best() == Parameters.GOAL);
     }
 
-    /**
-     * Retourne vrai si l'etat passe en parametre est egal a celui qui appelle la methode
-     *
-     * @param e
-     *
-     * @return
-     */
-    public boolean estegal(Etat e) {
-        return this.ensemble == e.getGrids() && this.deplacement.equals(e.getDeplacement());
-    }
-
     /**
      * Applique l'action passe en parametre
      *
@@ -221,45 +171,46 @@ public Etat AppliqueAction(Action a, Grids grids) {
      *
      * @return
      */
-    public boolean valide(String direction) {
+    private boolean valide(String direction) {
         boolean valide = false;
         int indice = 0;
+        Grid[] grids = this.ensemble.getGrids();
         switch (direction) {
             case "d":
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.right(this.ensemble.getGrids()[indice]);
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.right(grids[indice]);
                     indice++;
                 }
                 break;
             case "q":
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.left(this.ensemble.getGrids()[indice]);
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.left(grids[indice]);
                     indice++;
                 }
                 break;
             case "z":
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.up(this.ensemble.getGrids()[indice]);
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.up(grids[indice]);
                     indice++;
                 }
                 break;
             case "s":
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.down(this.ensemble.getGrids()[indice]);
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.down(grids[indice]);
                     indice++;
                 }
                 break;
             case "r":
-                this.ensemble = new Grids(this.ensemble.reorganization(this.ensemble.getGrids()));
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.down(this.ensemble.getGrids()[indice]);
+                this.ensemble = new Grids(this.ensemble.reorganization(grids));
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.down(grids[indice]);
                     indice++;
                 }
                 break;
             default:
-                this.ensemble = new Grids(this.ensemble.reorganization(this.ensemble.getGrids()));
-                while (!valide && indice < this.ensemble.getGrids().length) {
-                    valide = this.ensemble.up(this.ensemble.getGrids()[indice]);
+                this.ensemble = new Grids(this.ensemble.reorganization(grids));
+                while (!valide && indice < grids.length) {
+                    valide = this.ensemble.up(grids[indice]);
                     indice++;
                 }
                 break;

src/model/Ia/Noeud.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 08/12/2019
+ * Copyright (c) 09/12/2019
  *
  * Auteurs :
  *      - Behm Guillaume
@@ -23,14 +23,6 @@ public class Noeud {
     private ArrayList<Action> sol;
 
 
-    /**
-     * Constructeur
-     */
-    public Noeud() {
-        this.e = new Etat();
-        this.sol = null;
-    }
-
     /**
      * Fait une copie d'un noeud deja existant
      *
@@ -51,7 +43,6 @@ public Noeud(Etat ee, ArrayList<Action> aa) {
      *
      * @return
      */
-
     public Etat getetat() {
         return (this.e);
     }
@@ -65,15 +56,6 @@ public ArrayList<Action> getlisteaction() {
         return (this.sol);
     }
 
-    /**
-     * Setter
-     *
-     * @param ee
-     */
-    public void setetat(Etat ee) {
-        this.e = ee;
-    }
-
 
     /**
      * Ajoute une action dans les solutions

src/model/Ia/Probleme.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 08/12/2019
+ * Copyright (c) 09/12/2019
  *
  * Auteurs :
  *      - Behm Guillaume
@@ -59,7 +59,7 @@ public ArrayList<Action> getlisteactions() {
      *
      * @return
      */
-    public ArrayList<Action> setactions() {
+    private ArrayList<Action> setactions() {
         ArrayList<Action> la = new ArrayList<>();
         Action aa;
         aa = new Action();