feat: enhance menu, colors, sudoku, all is working, now multidoku ^^

This commit is contained in:
2025-02-06 17:54:17 +01:00
parent 7bc99258ec
commit b0b4152ec4
7 changed files with 354 additions and 227 deletions

View File

@@ -34,13 +34,11 @@ public class TestBlocRectangle {
sudoku.getGrille().setCase(0, 3, Symbole.of(9));
sudoku.getGrille().setCase(3, 0, Symbole.of(4));
sudoku.getGrille().creerBlocCarre();
sudoku.getGrille().creerBlocRectangulaire(3, 5);
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());
sudoku.getGrille().creerBlocRectangulaire(3, 5);
System.out.println("Blocs :");
sudoku.getGrille().printBlocs();

View File

@@ -8,7 +8,7 @@ import java.util.Arrays;
public class TestCreationGrille {
@Test
public void testLigne() {
//CREATION D'UN SUDOKU SIMPLE 12*12
// CREATION D'UN SUDOKU SIMPLE 12*12
Sudoku sudoku = new Sudoku(12);
sudoku.getGrille().setSymbolesPossibles(new ArrayList<>(Arrays.asList(
Symbole.of(1),
@@ -85,7 +85,13 @@ public class TestCreationGrille {
sudoku.getGrille().setCase(11, 6, Symbole.of(11));
sudoku.getGrille().setCase(11, 8, Symbole.of(6));
sudoku.getGrille().setCase(11, 11, Symbole.of(3));
// TODO
sudoku.getGrille().creerBlocRectangulaire(3, 4);
sudoku.ajouterContrainte(new ContrainteBloc());
sudoku.ajouterContrainte(new ContrainteColonne());
sudoku.ajouterContrainte(new ContrainteLigne());
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());
System.out.println("Blocs :");

View File

@@ -1,56 +1,56 @@
// package sudoku;
package sudoku;
// import java.util.ArrayList;
import java.util.ArrayList;
// import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Test;
// public class TestResolveurBacktraceSimpleSudoku25 {
// @Test
// public void testResolution() {
// System.out.println("TEST RESOLVEUR BACKTRACE SIMPLE : ");
// System.out.println(new App().getGreeting());
// // Create a new Sudoku
// Sudoku sudoku = new Sudoku(25);
public class TestResolveurBacktraceSimpleSudoku25 {
@Test
public void testResolution() {
System.out.println("TEST RESOLVEUR BACKTRACE SIMPLE : ");
System.out.println(new App().getGreeting());
// Create a new Sudoku
Sudoku sudoku = new Sudoku(25);
// ArrayList<Symbole> symboles = new ArrayList<>();
// for (int i = 1; i <= 25; i++) {
// symboles.add(Symbole.of(i));
// }
// sudoku.getGrille().setSymbolesPossibles(symboles);
ArrayList<Symbole> symboles = new ArrayList<>();
for (int i = 1; i <= 25; i++) {
symboles.add(Symbole.of(i));
}
sudoku.getGrille().setSymbolesPossibles(symboles);
// sudoku.ajouterContrainte(new ContrainteLigne());
// sudoku.ajouterContrainte(new ContrainteColonne());
// sudoku.ajouterContrainte(new ContrainteBloc());
sudoku.ajouterContrainte(new ContrainteLigne());
sudoku.ajouterContrainte(new ContrainteColonne());
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));
// sudoku.getGrille().setCase(0, 3, Symbole.of(4));
// sudoku.getGrille().setCase(4, 4, Symbole.of(5));
// sudoku.getGrille().setCase(0, 5, Symbole.of(6));
// sudoku.getGrille().setCase(5, 6, Symbole.of(7));
// sudoku.getGrille().setCase(0, 7, Symbole.of(8));
// sudoku.getGrille().setCase(4, 8, Symbole.of(9));
// sudoku.getGrille().setCase(0, 9, Symbole.of(25));
// sudoku.getGrille().setCase(6, 10, Symbole.of(11));
// sudoku.getGrille().setCase(2, 11, Symbole.of(12));
// sudoku.getGrille().setCase(0, 12, Symbole.of(13));
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3));
sudoku.getGrille().setCase(0, 3, Symbole.of(4));
sudoku.getGrille().setCase(4, 4, Symbole.of(5));
sudoku.getGrille().setCase(0, 5, Symbole.of(6));
sudoku.getGrille().setCase(5, 6, Symbole.of(7));
sudoku.getGrille().setCase(0, 7, Symbole.of(8));
sudoku.getGrille().setCase(4, 8, Symbole.of(9));
sudoku.getGrille().setCase(0, 9, Symbole.of(25));
sudoku.getGrille().setCase(6, 10, Symbole.of(11));
sudoku.getGrille().setCase(2, 11, Symbole.of(12));
sudoku.getGrille().setCase(0, 12, Symbole.of(13));
// sudoku.getGrille().creerBlocCarre();
sudoku.getGrille().creerBlocCarre();
// System.out.println("Sudoku :");
// System.out.println(sudoku.getGrille().toString());
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());
// System.out.println("Blocs :");
// sudoku.getGrille().printBlocs();
System.out.println("Blocs :");
sudoku.getGrille().printBlocs();
// System.out.println("Symboles possibles :");
// sudoku.getGrille().printSymbolesPossibles();
System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles();
// ResolveurBacktraceSimple resolveur = new ResolveurBacktraceSimple(sudoku);
// resolveur.resoudre(sudoku, false);
// System.out.println("Sudoku resolu :");
// System.out.println(sudoku.getGrille().toString());
// System.out.println("FIN TEST RESOLVEUR BACKTRACE SIMPLE");
// }
// }
// ResolveurBacktraceSimple resolveur = new ResolveurBacktraceSimple(sudoku);
// resolveur.resoudre(sudoku, false);
System.out.println("Sudoku resolu :");
System.out.println(sudoku.getGrille().toString());
System.out.println("FIN TEST RESOLVEUR BACKTRACE SIMPLE");
}
}