From cf4140eef77f68e126698d7ecf0036c6412e39a7 Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Wed, 16 Dec 2020 19:59:27 +0100 Subject: [PATCH 1/6] =?UTF-8?q?Ajout=20des=20principales=20m=C3=A9thodes?= =?UTF-8?q?=20de=20la=20classe=20BuildGrid:=20-=20fillWith()=20-=20display?= =?UTF-8?q?Grid()=20-=20putValue()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Aucune erreur détectée) --- src/main/java/fr/myny/grid/BuildGrid.java | 90 +++++++++++++++++++++++ src/main/java/test.java | 9 +++ 2 files changed, 99 insertions(+) create mode 100644 src/main/java/fr/myny/grid/BuildGrid.java create mode 100644 src/main/java/test.java diff --git a/src/main/java/fr/myny/grid/BuildGrid.java b/src/main/java/fr/myny/grid/BuildGrid.java new file mode 100644 index 0000000..3a88436 --- /dev/null +++ b/src/main/java/fr/myny/grid/BuildGrid.java @@ -0,0 +1,90 @@ +package fr.myny.grid; + +public class BuildGrid { + + private int m_dim_x; + private int m_dim_y; + private float m_grid[][]; + + /* + CONSTRUCTOR + */ + + public BuildGrid(int dim) + { + System.out.print("Creating a new grid: "); + + m_grid = new float[dim][dim]; + setDimX(dim); + setDimY(dim); + + this.fillWith(0); + System.out.println("Done"); + } + + public BuildGrid( int dim_x, int dim_y) + { + System.out.print("Creating a new grid: "); + + m_grid = new float[dim_x][dim_y]; + setDimX(dim_x); + setDimY(dim_y); + + this.fillWith(0); + System.out.println("Done"); + } + + /* + SETTERS & GETTERS + */ + + private int getDimX () + { + return m_dim_x; + } + + private int getDimY () + { + return m_dim_y; + } + + private void setDimX (int value) + { + m_dim_x = value; + } + + private void setDimY (int value) + { + m_dim_y = value; + } + + /* + TRANSFORM THE GRID + */ + + public void putValue(float value, int posX, int posY) + { + m_grid[posX][posY] = value; + } + + public void displayGrid () + { + for (int i = 0; i < getDimX(); i++) { + System.out.print("[ "); + for (int y = 0; y < getDimY(); y++) { + System.out.print(m_grid[i][y]); + System.out.print(" "); + } + System.out.println("]"); + } + } + + public void fillWith ( float value) + { + for (int i = 0; i < getDimX(); i++) { + for (int y = 0; y < getDimY(); y++) { + m_grid[i][y] = value; + } + } + } +} \ No newline at end of file diff --git a/src/main/java/test.java b/src/main/java/test.java new file mode 100644 index 0000000..0c3e58e --- /dev/null +++ b/src/main/java/test.java @@ -0,0 +1,9 @@ +import fr.myny.grid.BuildGrid; + +public class test{ + public static void main(String[] args){ + BuildGrid grid = new BuildGrid(5); + grid.putValue(15.5F, 2,3); + grid.displayGrid(); + } +} \ No newline at end of file From b2843b3dc35ed8f43c11ba89601aa25c805cb58d Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Wed, 16 Dec 2020 20:12:52 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Ajout=20des=20principales=20m=C3=A9thodes?= =?UTF-8?q?=20de=20la=20classe=20BuildGrid:=20-=20fillWith()=20-=20display?= =?UTF-8?q?Grid()=20-=20putValue()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Aucune erreur détectée) --- src/test/java/fr/myny/grid/BuildGridTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/fr/myny/grid/BuildGridTest.java diff --git a/src/test/java/fr/myny/grid/BuildGridTest.java b/src/test/java/fr/myny/grid/BuildGridTest.java new file mode 100644 index 0000000..366362a --- /dev/null +++ b/src/test/java/fr/myny/grid/BuildGridTest.java @@ -0,0 +1,27 @@ +package fr.myny.grid; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; +class BuildGridTest { + + @Test + void putValue() { + BuildGrid grid = new BuildGrid(5); + grid.putValue(18.5F, 2, 4); + grid.displayGrid(); + } + + @Test + void displayGrid() { + BuildGrid grid = new BuildGrid(5); + grid.displayGrid(); + } + + @Test + void fillWith() { + BuildGrid grid = new BuildGrid(5); + grid.fillWith(5.5F); + grid.displayGrid(); + } +} \ No newline at end of file From c77ad6e514aa2e7e3c3d042ffcf2cfb11158f1c1 Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Wed, 16 Dec 2020 20:49:08 +0100 Subject: [PATCH 3/6] Nouveau commit avec tests --- src/main/java/fr/myny/grid/BuildGrid.java | 35 ++++++++++++++++--- src/test/java/fr/myny/grid/BuildGridTest.java | 15 ++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/myny/grid/BuildGrid.java b/src/main/java/fr/myny/grid/BuildGrid.java index 3a88436..1aa27b0 100644 --- a/src/main/java/fr/myny/grid/BuildGrid.java +++ b/src/main/java/fr/myny/grid/BuildGrid.java @@ -1,5 +1,8 @@ package fr.myny.grid; +import java.util.Arrays; +import java.util.Objects; + public class BuildGrid { private int m_dim_x; @@ -38,22 +41,22 @@ public class BuildGrid { SETTERS & GETTERS */ - private int getDimX () + public int getDimX () { return m_dim_x; } - private int getDimY () + public int getDimY () { return m_dim_y; } - private void setDimX (int value) + public void setDimX (int value) { m_dim_x = value; } - private void setDimY (int value) + public void setDimY (int value) { m_dim_y = value; } @@ -67,6 +70,15 @@ public class BuildGrid { m_grid[posX][posY] = value; } + public float getValue(int posX, int posY) + { + return m_grid[posX][posY]; + } + + public float[][] getM_grid() { + return m_grid; + } + public void displayGrid () { for (int i = 0; i < getDimX(); i++) { @@ -87,4 +99,19 @@ public class BuildGrid { } } } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BuildGrid buildGrid = (BuildGrid) o; + return m_dim_x == buildGrid.m_dim_x && m_dim_y == buildGrid.m_dim_y && Arrays.equals(m_grid, buildGrid.m_grid); + } + + @Override + public int hashCode() { + int result = Objects.hash(m_dim_x, m_dim_y); + result = 31 * result + Arrays.hashCode(m_grid); + return result; + } } \ No newline at end of file diff --git a/src/test/java/fr/myny/grid/BuildGridTest.java b/src/test/java/fr/myny/grid/BuildGridTest.java index 366362a..750bd71 100644 --- a/src/test/java/fr/myny/grid/BuildGridTest.java +++ b/src/test/java/fr/myny/grid/BuildGridTest.java @@ -2,6 +2,8 @@ package fr.myny.grid; import org.junit.jupiter.api.Test; +import java.util.Arrays; + import static org.junit.jupiter.api.Assertions.*; class BuildGridTest { @@ -15,6 +17,19 @@ class BuildGridTest { @Test void displayGrid() { BuildGrid grid = new BuildGrid(5); + + assertEquals(5, grid.getDimX()); + assertEquals(5, grid.getDimY()); + assertEquals(0.0, grid.getValue(0,0)); + + float tabl[][] = new float[5][5]; + + for (int i = 0; i < 5; i++) { + for (int y = 0; y < 5; y++) { + tabl[i][y] = 0; + } + } + grid.displayGrid(); } From d0130802c9bd40567a9d2454a4a10af9f2dcab88 Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Wed, 16 Dec 2020 20:57:52 +0100 Subject: [PATCH 4/6] Changement de la table de float en table de double --- src/main/java/fr/myny/grid/BuildGrid.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/myny/grid/BuildGrid.java b/src/main/java/fr/myny/grid/BuildGrid.java index 1aa27b0..9c362d9 100644 --- a/src/main/java/fr/myny/grid/BuildGrid.java +++ b/src/main/java/fr/myny/grid/BuildGrid.java @@ -7,7 +7,7 @@ public class BuildGrid { private int m_dim_x; private int m_dim_y; - private float m_grid[][]; + private double m_grid[][]; /* CONSTRUCTOR @@ -17,7 +17,7 @@ public class BuildGrid { { System.out.print("Creating a new grid: "); - m_grid = new float[dim][dim]; + m_grid = new double[dim][dim]; setDimX(dim); setDimY(dim); @@ -29,7 +29,7 @@ public class BuildGrid { { System.out.print("Creating a new grid: "); - m_grid = new float[dim_x][dim_y]; + m_grid = new double[dim_x][dim_y]; setDimX(dim_x); setDimY(dim_y); @@ -70,12 +70,12 @@ public class BuildGrid { m_grid[posX][posY] = value; } - public float getValue(int posX, int posY) + public double getValue(int posX, int posY) { return m_grid[posX][posY]; } - public float[][] getM_grid() { + public double[][] getM_grid() { return m_grid; } From e834b258888c3c2f52e94a4d13f76a497f9ade37 Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Mon, 1 Feb 2021 19:29:32 +0100 Subject: [PATCH 5/6] Ajout de la classe BuildGrid --- src/main/java/fr/myny/grid/BuildGrid.java | 49 +++++++++++++++++++---- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/myny/grid/BuildGrid.java b/src/main/java/fr/myny/grid/BuildGrid.java index 9c362d9..025aabb 100644 --- a/src/main/java/fr/myny/grid/BuildGrid.java +++ b/src/main/java/fr/myny/grid/BuildGrid.java @@ -4,15 +4,33 @@ import java.util.Arrays; import java.util.Objects; public class BuildGrid { - - private int m_dim_x; - private int m_dim_y; + /** Tableau à deux dimension qui va contenir les grilles proposees par le logiciel */ private double m_grid[][]; + /** nombre de lignes du tableau, soit le nombre de grilles à jouer que va proposer le tableau */ + private int m_dim_x; + + /** nombre de colonnes du tableau */ + private int m_dim_y; + /* CONSTRUCTOR */ + /** Constructeur par defaut*/ + public BuildGrid() + { + System.out.print("Creating a new grid: "); + + m_grid = new double[1][5]; + setDimX(1); + setDimY(5); + + this.fillWith(0); + System.out.println("Done"); + } + + /** Constructeur avec parametres (Le tableau cree aura autant de lignes que de colonnes)*/ public BuildGrid(int dim) { System.out.print("Creating a new grid: "); @@ -25,6 +43,7 @@ public class BuildGrid { System.out.println("Done"); } + /** Constructeur avec parametres*/ public BuildGrid( int dim_x, int dim_y) { System.out.print("Creating a new grid: "); @@ -41,21 +60,25 @@ public class BuildGrid { SETTERS & GETTERS */ + /** Methode retournant le nombre de lignes du tableau*/ public int getDimX () { return m_dim_x; } + /** Methode retournant le nombre de colonnes du tableau*/ public int getDimY () { return m_dim_y; } + /** Modifie le nombre de lignes du tableau*/ public void setDimX (int value) { m_dim_x = value; } + /** Modifie le nombre de colonnes du tableau*/ public void setDimY (int value) { m_dim_y = value; @@ -65,20 +88,24 @@ public class BuildGrid { TRANSFORM THE GRID */ - public void putValue(float value, int posX, int posY) + /** Methode permettant de mettre a jour la case (X,Y) du tableau avec le parametre 'value'*/ + public void putValue(float value, int X, int Y) { - m_grid[posX][posY] = value; + m_grid[X][Y] = value; } - public double getValue(int posX, int posY) + /** Methode permettant de recuperer la valeur de la case (X,Y) du tableau */ + public double getValue(int X, int Y) { - return m_grid[posX][posY]; + return m_grid[X][Y]; } + /** Methode renvoyant une reference du tableau */ public double[][] getM_grid() { return m_grid; } + /** Methode permettant d'afficher le contenu du tableau a deux dimension sur un terminal*/ public void displayGrid () { for (int i = 0; i < getDimX(); i++) { @@ -91,6 +118,7 @@ public class BuildGrid { } } + /** Methode permettant de remplir toutes les cases du tableau avec la valeur du parametre 'value' */ public void fillWith ( float value) { for (int i = 0; i < getDimX(); i++) { @@ -100,6 +128,12 @@ public class BuildGrid { } } + /** Methode permettant de determiner les grilles a jouer que va proposer le systeme reducteur*/ + public void systemeReduc(int nb_numeros, int[] serie_de_numeros, float garantie) + { + } + + /** Methode surchargee permettant de verifier si deux tableaux sont egaux en comparant leur contenu */ @Override public boolean equals(Object o) { if (this == o) return true; @@ -108,6 +142,7 @@ public class BuildGrid { return m_dim_x == buildGrid.m_dim_x && m_dim_y == buildGrid.m_dim_y && Arrays.equals(m_grid, buildGrid.m_grid); } + /** Methode assignant un nombre unique a chaque instance de la classe Grid pour les differencier entre elles*/ @Override public int hashCode() { int result = Objects.hash(m_dim_x, m_dim_y); From fbfbc1b821e0ffa0b63ee5da66c4b9315d94307e Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Mon, 1 Feb 2021 19:31:57 +0100 Subject: [PATCH 6/6] J'ai supprimer des truc sur branch Maxime --- src/main/java/test.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/main/java/test.java diff --git a/src/main/java/test.java b/src/main/java/test.java deleted file mode 100644 index 0c3e58e..0000000 --- a/src/main/java/test.java +++ /dev/null @@ -1,9 +0,0 @@ -import fr.myny.grid.BuildGrid; - -public class test{ - public static void main(String[] args){ - BuildGrid grid = new BuildGrid(5); - grid.putValue(15.5F, 2,3); - grid.displayGrid(); - } -} \ No newline at end of file