Morph01/Sudoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add constraint management and validation to Sudoku class

Browse Source
This commit is contained in:
Morph01
2025-01-05 11:16:34 +01:00
parent d8486a3bd7
commit b1dde68ec1
6 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/sudoku/Grille.java
View File

@@ -199,6 +199,10 @@ public class Grille {
System.out.println(sb.toString());
}
public int getTaille() {
return taille;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

22
app/src/main/java/sudoku/Sudoku.java
View File

@@ -1,10 +1,32 @@
package sudoku;
import java.util.ArrayList;
import java.util.List;
public class Sudoku {
private final Grille grille;
private final List<Contrainte> contraintes;
public Sudoku(int taille) {
this.grille = new Grille(taille);
this.contraintes = new ArrayList<>();
}
public void ajouterContrainte(Contrainte contrainte) {
contraintes.add(contrainte);
}
public void creerBloc(List<int[]> positions) {
grille.creerBloc(positions);
}
public boolean estValide(Case c) {
for (Contrainte contrainte : contraintes) {
if (!contrainte.estRespectee(grille, c)) {
return false;
}
}
return true;
}
public Grille getGrille() {

55
app/src/test/java/sudoku/AppTest.java
View File

@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class AppTest {
@Test
@@ -32,4 +33,58 @@ public class AppTest {
Symbole.of(9)));
assertEquals(expectedSymbols, sudoku.getGrille().getSymbolesPossibles());
}
@Test
public void testContraintes() {
// Create a new Sudoku
Sudoku sudoku = new Sudoku(9);
sudoku.getGrille().setSymbolesPossibles(new ArrayList<>(Arrays.asList(
Symbole.of(1),
Symbole.of(2),
Symbole.of(3),
Symbole.of(4),
Symbole.of(5),
Symbole.of(6),
Symbole.of(7),
Symbole.of(8),
Symbole.of(9))));
// Add constraints
sudoku.ajouterContrainte(new ContrainteLigne());
sudoku.ajouterContrainte(new ContrainteColonne());
sudoku.ajouterContrainte(new ContrainteBloc());
// Fill the grid with valid symbols
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(0, 1, Symbole.of(2));
sudoku.getGrille().setCase(0, 2, Symbole.of(3));
sudoku.getGrille().setCase(1, 0, Symbole.of(4));
sudoku.getGrille().setCase(1, 1, Symbole.of(5));
sudoku.getGrille().setCase(1, 2, Symbole.of(6));
sudoku.getGrille().setCase(2, 0, Symbole.of(7));
sudoku.getGrille().setCase(2, 1, Symbole.of(8));
sudoku.getGrille().setCase(2, 2, Symbole.of(9));
// Create square blocks
sudoku.getGrille().creerBlocCarre();
System.out.println(sudoku.getGrille().toString());
// Verify that the constraints are respected
assertTrue(sudoku.estValide(sudoku.getGrille().getCase(0, 0)));
assertTrue(sudoku.estValide(sudoku.getGrille().getCase(1, 1)));
assertTrue(sudoku.estValide(sudoku.getGrille().getCase(2, 2)));
// Add a duplicate symbol in the same row
// sudoku.getGrille().setCase(0, 3, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(0, 3)));
// Add a duplicate symbol in the same column
// sudoku.getGrille().setCase(3, 0, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(3, 0)));
// Add a duplicate symbol in the same block
// sudoku.getGrille().setCase(1, 1, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(1, 1)));
}
}

8
app/src/test/java/sudoku/TestBloc.java
View File

@@ -2,6 +2,8 @@ package sudoku;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,6 +25,9 @@ public class TestBloc {
Symbole.of(8),
Symbole.of(9))));
// Add constraints
sudoku.ajouterContrainte(new ContrainteBloc());
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3));
@@ -34,8 +39,9 @@ public class TestBloc {
sudoku.getGrille().setCase(4, 8, Symbole.of(9));
//doublon bloc
sudoku.getGrille().setCase(1, 1, Symbole.of(1));
assertFalse(sudoku.estValide(sudoku.getGrille().getCase(1, 1)));
sudoku.getGrille().createSquareBlocs();
sudoku.getGrille().creerBlocCarre();
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());

7
app/src/test/java/sudoku/TestColonne.java
View File

@@ -2,6 +2,8 @@ package sudoku;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,6 +25,8 @@ public class TestColonne {
Symbole.of(8),
Symbole.of(9))));
sudoku.ajouterContrainte(new ContrainteColonne());
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3));
@@ -34,8 +38,9 @@ public class TestColonne {
sudoku.getGrille().setCase(4, 8, Symbole.of(9));
// doublon colonne
sudoku.getGrille().setCase(4, 0, Symbole.of(1));
assertFalse(sudoku.estValide(sudoku.getGrille().getCase(4, 0)));
sudoku.getGrille().createSquareBlocs();
sudoku.getGrille().creerBlocCarre();
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());

7
app/src/test/java/sudoku/TestLigne.java
View File

@@ -2,6 +2,8 @@ package sudoku;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,6 +25,8 @@ public class TestLigne {
Symbole.of(8),
Symbole.of(9))));
sudoku.ajouterContrainte(new ContrainteLigne());
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3));
@@ -34,8 +38,9 @@ public class TestLigne {
sudoku.getGrille().setCase(4, 8, Symbole.of(9));
//doublon ligne
sudoku.getGrille().setCase(0, 4, Symbole.of(1));
assertFalse(sudoku.estValide(sudoku.getGrille().getCase(0, 4)));
sudoku.getGrille().createSquareBlocs();
sudoku.getGrille().creerBlocCarre();
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());