feat: multi select sudoku

app/src/main/java/gui/RenderableMultidoku.java

@@ -47,6 +47,8 @@ public class RenderableMultidoku {
 		return cells.get(index);
 	}
 
+	
+
 	private static record PositionConstraint(Sudoku sudoku1, Sudoku sudoku2, Coordinate offset) {
 	}
 

app/src/main/java/gui/SudokuSelector.java

@@ -26,16 +26,16 @@ public class SudokuSelector {
 	private final ImInt difficulty = new ImInt(Difficulty.Medium.ordinal());
 	private final List<ImBoolean> contraints = new ArrayList<>();
 
-	private static final String[] sudokuTypes = { "Carré", "Rectangle", "Multidoku" };
-	private static final int SQUARE = 0, RECTANGLE = 1, MULTIDOKU = 2;
-
 	private final ImInt sudokuSize = new ImInt(3);
 
 	private final ImInt sudokuWidth = new ImInt(3);
 	private final ImInt sudokuHeight = new ImInt(3);
 
-	public SudokuSelector(boolean canGenEmptyGrid) {
+	private final String confirmMessage;
+
+	public SudokuSelector(boolean canGenEmptyGrid, String confirmMessage) {
 		this.canGenEmptyGrid = canGenEmptyGrid;
+		this.confirmMessage = confirmMessage;
 		initConstraints();
 	}
 
@@ -98,7 +98,7 @@ public class SudokuSelector {
 		switch (currentType.getMakerParamCount()) {
 			case 1:
 				ImGui.inputInt("Taille", sudokuSize);
-				if (ImGui.button("Résoudre un sudoku")) {
+				if (ImGui.button(confirmMessage)) {
 					selectSudoku(currentType.createDoku(getConstraints(), sudokuSize.get()), false);
 				}
 				if (canGenEmptyGrid && ImGui.button("Générer une grille vide")) {
@@ -109,7 +109,7 @@ public class SudokuSelector {
 			case 2:
 				ImGui.inputInt("Largeur", sudokuHeight);
 				ImGui.inputInt("Longueur", sudokuWidth);
-				if (ImGui.button("Résoudre un sudoku")) {
+				if (ImGui.button(confirmMessage)) {
 					selectSudoku(currentType.createDoku(getConstraints(), sudokuWidth.get(), sudokuHeight.get()),
 							false);
 				}

app/src/main/java/gui/menu/MultiPlayerView.java

@@ -1,24 +1,27 @@
 package gui.menu;
 
-import java.util.Arrays;
-
 import game.Player;
+import gui.SudokuSelector;
 import imgui.ImGui;
 import network.client.Client;
 import network.server.Server;
-import sudoku.constraint.Constraint;
 import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;
 
 public class MultiPlayerView extends BaseView {
 
 	private final Client client;
 	private final Server server;
 
+	private final SudokuSelector selector;
+
+	private MultiDoku doku = null;
+
 	public MultiPlayerView(StateMachine stateMachine, Client client, Server server) {
 		super(stateMachine);
 		this.client = client;
 		this.server = server;
+		this.selector = new SudokuSelector(false, "Sélectionner le sudoku");
+		this.selector.onSelect.connect(this::onSelected);
 		this.client.onDisconnect.connect(this::onDisconnect);
 		this.client.onGameStarted
 				.connect(() -> this.stateMachine.pushState(new MultiPlayerDokuView(stateMachine, client, server)));
@@ -34,15 +37,22 @@ public class MultiPlayerView extends BaseView {
 		this.stateMachine.popState();
 	}
 
+	private void onSelected() {
+		this.doku = this.selector.getDoku();
+	}
+
 	public void renderGameStatus() {
 		if (this.server == null) {
 			ImGui.text("En attente de l'administrateur du serveur ...");
 		} else {
+			if (this.doku == null)
+				ImGui.beginDisabled();
 			if (ImGui.button("Démarrer")) {
-				// temp
-				MultiDoku doku = SudokuFactory.createBasicXShapedMultidoku(3, Arrays.asList(Constraint.Diagonal));
-				this.server.startGame(doku);
+				this.server.startGame(this.doku);
 			}
+			if (this.doku == null)
+				ImGui.endDisabled();
+			selector.render();
 		}
 	}
 

app/src/main/java/gui/menu/SoloMenu.java

@@ -9,7 +9,7 @@ public class SoloMenu extends BaseView {
 
 	public SoloMenu(StateMachine stateMachine) {
 		super(stateMachine);
-		this.sudokuSelector = new SudokuSelector(true);
+		this.sudokuSelector = new SudokuSelector(true, "Résoudre le sudoku");
 		this.sudokuSelector.onSelect.connect(this::pushSudokuState);
 	}
 

app/src/main/java/sudoku/Main.java

@@ -3,40 +3,15 @@
  */
 package sudoku;
 
-import gui.RenderableMultidoku;
-import gui.Symbols;
 import sudoku.io.ConsoleInterface;
-import sudoku.io.SudokuPrinter;
-import sudoku.solver.RandomSolver;
-import sudoku.solver.Solver;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;
-
-import java.util.Random;
 
 public class Main {
     public String getGreeting() {
         return "Hello World!";
     }
 
-    public static void voidTest(){
-        MultiDoku md = SudokuFactory.createBasicXShapedMultidoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
-        SudokuPrinter.printMultiDoku(RenderableMultidoku.fromMultidoku(md), Symbols.Numbers, 3, 3);
-    }
-
-    public static void filledTest(){
-        MultiDoku md = SudokuFactory.createBasicXShapedMultidoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
-        new RandomSolver().solve(md);
-        SudokuPrinter.printMultiDoku(RenderableMultidoku.fromMultidoku(md), Symbols.Numbers, 3, 3);
-    }
-
     public static void main(String[] args) {
         ConsoleInterface console = new ConsoleInterface();
-        /*
-        voidTest();
-        filledTest();
-        filledTest();
-        */
-        console.welcome();
+        console.start();
     }
 }

app/src/main/java/sudoku/io/ConsoleInterface.java

@@ -1,27 +1,21 @@
 package sudoku.io;
 
-import gui.RenderableMultidoku;
-import gui.Symbols;
-import sudoku.constraint.*;
-import sudoku.solver.RandomSolver;
-import sudoku.structure.Difficulty;
-import sudoku.structure.MultiDoku;
-import sudoku.structure.SudokuFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
 
+import sudoku.constraint.Constraint;
+import sudoku.solver.RandomSolver;
+import sudoku.structure.Difficulty;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.Sudoku;
+import sudoku.structure.SudokuFactory;
+
 public class ConsoleInterface {
     public Scanner reader = new Scanner(System.in);
 
-    public void welcome(){
-        System.out.println("Welcome to our Sudoku Solver!");
-        System.out.println("This is the project of Melvyn Bauvent, Lilas Grenier and Simon Priblyski.");
-        start();
-    }
-
     public void start(){
+        welcome();
         System.out.println("First of all, you need to tell me the size of the sudoku you want to generate.");
         int width = getBlockWidth();
         int height = getBlockHeight();
@@ -33,21 +27,26 @@ public class ConsoleInterface {
             pickSymbols(listSymbols, numberOfSymbols);
         }
         else {
-            listSymbols = Symbols.Numbers.getSymbols();
+            // TODO
+            System.out.println("Simon doit finir sa partie.");
+            assert false;
         }
         List<Constraint> listConstraints = getListConstraints();
+
+
         System.out.println("Now that we have the size of our sudoku, would you rather have a single grid ('one', default), " +
                 "or a a multidoku composed of 5 subgrids ('multi') ?");
+        List<Sudoku> subGrids = new ArrayList<>();
         MultiDoku doku;
         if (reader.next().equalsIgnoreCase("multi")) {
-            doku = SudokuFactory.createBasicXShapedMultidoku(width, height, listConstraints);
-        }
-        else {
             doku = SudokuFactory.createBasicEmptyRectangleDoku(width, height, listConstraints);
         }
-        RenderableMultidoku rm = RenderableMultidoku.fromMultidoku(doku);
+        else {
+            doku = SudokuFactory.createBasicXShapedMultidoku(width, height, listConstraints);
+        }
         System.out.println("Your sudoku will look like this:");
-        SudokuPrinter.printMultiDoku(rm, listSymbols, width, height);
+        // TODO printMultiDoku method not yet implemented
+        SudokuPrinter.printMultiDoku(doku, width, height);
         System.out.println("We now will fill this sudoku.");
         System.out.println("What level of difficulty would you like? ('very easy', 'easy', 'medium' (default), 'hard', 'full' (sudoku fully completed))");
         String difficulty = reader.next().toLowerCase();
@@ -58,7 +57,12 @@ public class ConsoleInterface {
             generatePartialDoku(doku, difficulty);
         }
         System.out.println("Here's your sudoku !");
-        SudokuPrinter.printMultiDoku(rm, listSymbols, width, height);
+        SudokuPrinter.printMultiDoku(doku, width, height);
+    }
+
+    public void welcome(){
+        System.out.println("Welcome to our Sudoku Solver!");
+        System.out.println("This is the project of Melvyn Bauvent, Lilas Grenier and Simon Priblyski.");
     }
 
     public int getBlockWidth() {

app/src/main/java/sudoku/io/SudokuPrinter.java

@@ -1,40 +1,18 @@
 package sudoku.io;
 
-import gui.RenderableMultidoku;
-import gui.Symbols;
-import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
 import sudoku.structure.Sudoku;
 
-import java.util.List;
-
 public class SudokuPrinter {
-	public static final String ANSI_RESET = "\u001B[0m";
-	public static final String ANSI_RED = "\u001B[31m";
-	public static final String ANSI_GREEN = "\u001B[32m";
-	public static final String ANSI_YELLOW = "\u001B[33m";
-	public static final String ANSI_BLUE = "\u001B[34m";
-	public static final String ANSI_PURPLE = "\u001B[35m";
-	public static final String ANSI_CYAN = "\u001B[36m";
 
-	public static void printRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight, Symbols symbols) {
-		printRectangleSudoku(s, blockWidth, blockHeight, symbols.getSymbols());
-	}
-
-	public static void printRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight, List<String> listSymbols){
+	public static void printRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight) {
 		for (int y = 0; y < s.getSize(); y++) {
 			if (y % blockHeight == 0 && y > 0) {
 				System.out.println();
 			}
 			StringBuilder line = new StringBuilder("[ ");
 			for (int x = 0; x < s.getSize(); x++) {
-			Cell c = s.getCell(x, y);
-			if (c.getSymbolIndex() == Cell.NOSYMBOL) {
-				line.append("  ");
-			}
-			else {
-				line.append(listSymbols.get(c.getSymbolIndex())).append(" ");
-			}
+				line.append((s.getCell(x, y).getSymbolIndex() + 1)).append(" ");
 				if (x % blockWidth == blockWidth - 1 && x != blockWidth * blockHeight - 1) {
 					line.append("| ");
 				}
@@ -44,46 +22,7 @@ public class SudokuPrinter {
 		}
 	}
 
-	public static void printMultiDoku(final RenderableMultidoku rm, Symbols symbols, int blockWidth, int blockHeight) {
-		printMultiDoku(rm, symbols.getSymbols(), blockWidth, blockHeight);
-	}
-
-	public static void printMultiDoku(final RenderableMultidoku rm, List<String> listSymbols, int blockWidth, int blockHeight) {
-		StringBuilder line = new StringBuilder("\n");
-		int nBlockInWidth = rm.getWidth() / blockWidth;
-		for (int y = 0; y < rm.getHeight(); y++) {
-			if (y % blockHeight == 0) {
-                line.append("__".repeat(Math.max(0, rm.getWidth()+nBlockInWidth))).append("_\n");
-			}
-			line.append("[ ");
-			for (int x = 0; x < rm.getWidth(); x++) {
-				if (x % blockWidth == 0 && x > 0) {
-					line.append("| ");
-				}
-				Cell cell = rm.getCell(x, y);
-				if (cell != null) {
-					if (cell.getSymbolIndex() == Cell.NOSYMBOL) {
-						line.append("- ");
-					}
-					else {
-						line.append(listSymbols.get(cell.getSymbolIndex())).append(" ");
-					}
-				}
-				else {
-					line.append("  ");
-				}
-			}
-			line.append("]\n");
-		}
-		line.append("__".repeat(Math.max(0, rm.getWidth()+nBlockInWidth))).append("_\n");
-		System.out.println(line);
-	}
-
-	public static String toStringRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight, Symbols symbols){
-		return toStringRectangleSudoku(s, blockWidth, blockHeight, symbols.getSymbols());
-	}
-
-	public static String toStringRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight, List<String> listSymbols) {
+	public static String toStringRectangleSudoku(final Sudoku s, int blockWidth, int blockHeight) {
 		StringBuilder result = new StringBuilder();
 		for (int y = 0; y < s.getSize(); y++) {
 			// Ajouter une ligne vide entre les blocs horizontaux
@@ -93,13 +32,7 @@ public class SudokuPrinter {
 			StringBuilder line = new StringBuilder("[ ");
 			for (int x = 0; x < s.getSize(); x++) {
 				// Ajouter la valeur de la cellule
-				Cell cell = s.getCell(x, y);
-				if (cell.getSymbolIndex() == Cell.NOSYMBOL) {
-					line.append("  ");
-				}
-				else {
-					line.append(listSymbols.get(cell.getSymbolIndex())).append(" ");
-				}
+				line.append((s.getCell(x, y).getSymbolIndex() + 1)).append(" ");
 
 				// Ajouter un séparateur vertical entre les blocs
 				if (x % blockWidth == blockWidth - 1 && x != s.getSize() - 1) {
@@ -112,12 +45,7 @@ public class SudokuPrinter {
 		return result.toString();
 	}
 
-	public static void printMultiDoku(final MultiDoku doku, int blockWidth, int blockHeight, Symbols symbols){
-		if (doku.getNbSubGrids()==1) {
-			printRectangleSudoku(doku.getSubGrid(0), blockWidth, blockHeight, symbols);
-		}
-		else {
-			printMultiDoku(RenderableMultidoku.fromMultidoku(doku), symbols, blockWidth, blockHeight);
-		}
+	public static void printMultiDoku(final MultiDoku doku, int blockWidth, int blockHeight){
+		// TODO
 	}
 }

app/src/main/java/sudoku/solver/HumanSolver.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -27,8 +26,7 @@ public class HumanSolver implements Solver {
 		logger.log(Level.FINE,
 				'\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
 						sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-						sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-				Symbols.Numbers));
+						sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
 
 		if (doku.isSolved()) {
 			return true;

app/src/main/java/sudoku/solver/MixedSolver.java

@@ -5,7 +5,6 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -18,6 +17,8 @@ public class MixedSolver implements Solver{
      * backtracking.
      *
      * @param doku MultiDoku, MultiDoku à résoudre.
+     * @param rand Random, pour tester aléatoirement les symboles, lors du
+     *             backtracking.
      * @return boolean, valant true si le MultiDoku est résolu, false sinon.
      */
 	@Override
@@ -33,8 +34,7 @@ public class MixedSolver implements Solver{
                 '\n' + SudokuPrinter.toStringRectangleSudoku(
                         sudoku,
                         sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-                Symbols.Numbers));
+                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
 
         if (doku.isSolved()) {
             return true;

app/src/main/java/sudoku/solver/RandomSolver.java

@@ -5,7 +5,6 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -33,8 +32,7 @@ public class RandomSolver implements Solver {
         logger.log(Level.FINE,
                 '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
                         sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
-                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(),
-                        Symbols.Numbers));
+                        sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
 
         if (doku.isSolved()) {
             return true;

app/src/test/java/sudoku/solver/SolverTest.java

@@ -1,6 +1,5 @@
 package sudoku.solver;
 
-import gui.Symbols;
 import org.junit.jupiter.api.Test;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
@@ -39,8 +38,7 @@ class SolverTest {
 
 		assert (sudokuToTest.setImmutableCellsSymbol(immutableCells));
 
-		//SudokuPrinter.printRectangleSudoku(dokuToTest.getSubGrid(0), 3, 3);
-		SudokuPrinter.printMultiDoku(dokuToTest, 3, 3, Symbols.Numbers);
+		SudokuPrinter.printRectangleSudoku(dokuToTest.getSubGrid(0), 3, 3);
 
 		List<Integer> correctCells = List.of(7, 6, 0, 3, 4, 2, 8, 5, 1,
 				2, 3, 8, 1, 5, 6, 7, 0, 4,
@@ -55,15 +53,14 @@ class SolverTest {
 		sudokuResult.setCellsSymbol(correctCells);
 
 		System.out.println("\n****************************Doku Control\n");
-		SudokuPrinter.printRectangleSudoku(sudokuResult, 3, 3, Symbols.Russian);
+		SudokuPrinter.printRectangleSudoku(sudokuResult, 3, 3);
 
 		assert (dokuResult.isSolved());
 
 		new RandomSolver().solve(dokuToTest);
 
 		System.out.println("\n****************************\nDoku solved");
-		//SudokuPrinter.printRectangleSudoku(dokuToTest.getSubGrid(0), 3, 3);
-		SudokuPrinter.printMultiDoku(dokuToTest, 3, 3, Symbols.Emojis);
+		SudokuPrinter.printRectangleSudoku(dokuToTest.getSubGrid(0), 3, 3);
 
 		assert (dokuToTest.isSolved());
 
@@ -100,7 +97,6 @@ class SolverTest {
 
 		new RandomSolver().solve(dokuToTest3);
 
-		//SudokuPrinter.printRectangleSudoku(dokuToTest3.getSubGrid(0), 3, 3);
-		SudokuPrinter.printMultiDoku(dokuToTest3, 3, 3, Symbols.Letters);
+		SudokuPrinter.printRectangleSudoku(dokuToTest3.getSubGrid(0), 3, 3);
 	}
 }