fix renderable multidoku max coords

app/src/main/java/gui/Main.java

@@ -1,9 +1,16 @@
 package gui;
 
+import gui.constants.Fonts;
+import gui.constants.Images;
+import gui.constants.Symbols;
 import gui.menu.MainMenu;
 import gui.menu.StateMachine;
 import imgui.app.Application;
 import imgui.app.Configuration;
+import sudoku.io.SudokuPrinter;
+import sudoku.structure.Difficulty;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.SudokuFactory;
 
 public class Main extends Application {
 
@@ -39,6 +46,13 @@ public class Main extends Application {
     }
 
     public static void main(String[] args) {
-        launch(new Main());
+        MultiDoku doku = SudokuFactory.createBasicPlusShapedMultidoku(3, 3, SudokuFactory.DEFAULT_CONSTRAINTS);
+        try {
+            SudokuFactory.fillDoku(doku, Difficulty.Easy);
+        } catch (Exception e) {
+            throw new RuntimeException();
+        }
+        SudokuPrinter.printMultiDoku(doku, 3, 3, Symbols.Numbers);
+        //launch(new Main());
     }
 }

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

@@ -90,29 +90,23 @@ public class RenderableMultidoku {
 	}
 
 	private static Coordinate getMaxSudokuCoordinate(Map<Sudoku, Coordinate> sudokusOffset) {
-		Coordinate maxCoordinate = null;
+		int maxX = 0;
-		Sudoku maxSudoku = null;
+		int maxY = 0;
-		float maxDistanceSquared = 0;
+		Sudoku lastSudoku = null;
 		for (var entry : sudokusOffset.entrySet()) {
 			Coordinate coordinate = entry.getValue();
-			float distanceSquared = coordinate.getX() * coordinate.getX() + coordinate.getY() * coordinate.getY();
+			if (coordinate.getX() > maxX)
-			if (maxCoordinate == null) {
+			maxX = coordinate.getX();
-				maxCoordinate = coordinate;
+			if (coordinate.getY() > maxY)
-				maxDistanceSquared = distanceSquared;
+			maxY = coordinate.getY();
-				maxSudoku = entry.getKey();
+			lastSudoku = entry.getKey();
 		}
 
-			if (distanceSquared > maxDistanceSquared) {
+		Coordinate maxCoordinate = new Coordinate(maxX, maxY);
-				maxDistanceSquared = distanceSquared;
+		// tous les sudokus sont censés faire la même taille
-				maxSudoku = entry.getKey();
+		int sudokuSize = lastSudoku.getSize();
-				maxCoordinate = coordinate;
-			}
-		}
 
-		int blockWidth = maxSudoku.getBlockWidth();
+		return new Coordinate(maxCoordinate.getX() + sudokuSize, maxCoordinate.getY() + sudokuSize);
-		int blockHeight = maxSudoku.getSize() / blockWidth;
-
-		return new Coordinate(maxCoordinate.getX() + maxSudoku.getSize(), maxCoordinate.getY() + maxSudoku.getSize());
 	}
 
 	public static RenderableMultidoku fromMultidoku(MultiDoku doku) {

app/src/main/java/gui/constants/Fonts.java

@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import imgui.ImFont;
 import imgui.ImFontConfig;

app/src/main/java/gui/constants/Images.java

@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.nio.ByteBuffer;
 

app/src/main/java/gui/constants/Options.java

@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 public class Options {
 

app/src/main/java/gui/constants/SudokuType.java

@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.util.List;
 
@@ -14,10 +14,14 @@ public enum SudokuType {
 			(constraints, params) -> SudokuFactory.createBasicEmptyRectangleDoku(params[0], params[1], constraints)),
 	RandomBloc("Blocs aléatoires", 1,
 			(constraints, params) -> SudokuFactory.createBasicEmptyRandomBlockDoku(params[0], constraints)),
-	MultiDokuSquare("Multidoku carré (X)", 1,
+	MultiDokuXSquare("Multidoku carré (X)", 1,
 			(constraints, params) -> SudokuFactory.createBasicXShapedMultidoku(params[0], constraints)),
-	MultidokuRectangle("Multidoku rectangle (X)", 2,
+	MultidokuXRectangle("Multidoku rectangle (X)", 2,
-			(constraints, params) -> SudokuFactory.createBasicXShapedMultidoku(params[0], params[1], constraints));
+			(constraints, params) -> SudokuFactory.createBasicXShapedMultidoku(params[0], params[1], constraints)),
+	MultiDokuPSquare("Multidoku carré (+)", 1,
+			(constraints, params) -> SudokuFactory.createBasicPlusShapedMultidoku(params[0], constraints)),
+	MultiDokuPRectangle("Multidoku rectangle (+)", 2,
+			(constraints, params) -> SudokuFactory.createBasicPlusShapedMultidoku(params[0], params[1], constraints));
 
 	String displayName;
 	SudokuMaker maker;

app/src/main/java/gui/constants/Symbols.java

@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package gui.menu;
 
-import gui.Options;
+import gui.constants.Options;
-import gui.Symbols;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.type.ImInt;
 

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

@@ -2,7 +2,7 @@ package gui.menu;
 
 import java.util.Stack;
 
-import gui.AnimatedBackground;
+import gui.widget.AnimatedBackground;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiKey;

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

@@ -1,5 +1,7 @@
 package gui.menu;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CancellationException;
 
 import gui.widget.SudokuRenderer;
@@ -11,6 +13,7 @@ import sudoku.solver.HintHelper;
 import sudoku.solver.HumanSolver;
 import sudoku.solver.MixedSolver;
 import sudoku.solver.Solver;
+import sudoku.solver.SolverStep;
 import sudoku.solver.HintHelper.Hint;
 import sudoku.structure.MultiDoku;
 
@@ -90,8 +93,9 @@ public class SudokuView extends BaseView {
 
 	private void startSolve(Solver solver) {
 		resolveThread = new Thread(() -> {
+			List<SolverStep> steps = new ArrayList<>();
 			try {
-				unresolved = !solver.solve(this.doku);
+				unresolved = !solver.solve(this.doku, steps);
 			} catch (CancellationException e) {
 				System.out.println("The user is bored !");
 			}

app/src/main/java/gui/widget/AnimatedBackground.java

@@ -1,5 +1,7 @@
-package gui;
+package gui.widget;
 
+import gui.constants.Images;
+import gui.constants.Options;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiWindowFlags;

app/src/main/java/gui/widget/SudokuRenderer.java

@@ -9,11 +9,11 @@ import java.util.Set;
 import common.ConsumerSignal;
 import common.Signal;
 import gui.ColorGenerator;
-import gui.Fonts;
-import gui.Options;
-import gui.RenderableMultidoku;
-import gui.Symbols;
 import gui.ColorGenerator.Color;
+import gui.RenderableMultidoku;
+import gui.constants.Fonts;
+import gui.constants.Options;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;

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

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import common.ConsumerSignal;
-import gui.SudokuType;
+import gui.constants.SudokuType;
 import imgui.ImGui;
 import imgui.extension.imguifiledialog.ImGuiFileDialog;
 import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;

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

@@ -4,17 +4,14 @@
 package sudoku;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.ConsoleInterface;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
 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!";

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

@@ -1,7 +1,7 @@
 package sudoku.io;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.constraint.*;
 import sudoku.solver.*;
 import sudoku.structure.*;
@@ -15,7 +15,7 @@ public class ConsoleInterface {
 
     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.");
+        System.out.println("This is the project of Melvyn Bauvent, Lilas Grenier and Simon Pribylski.");
         System.out.println("Do you have a save sudoku you would like to continue? (y/n, default n)");
         if (reader.next().equalsIgnoreCase("y")) {
             useSavedDoku();

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

@@ -1,7 +1,7 @@
 package sudoku.io;
 
 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
 import sudoku.structure.Sudoku;

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

@@ -15,7 +15,7 @@ public class BacktrackingSolver implements Solver {
 	 * @return boolean, valant true si le MultiDoku est résolu, false sinon.
 	 */
 	@Override
-	public boolean solve(MultiDoku doku) {
+	public boolean solve(MultiDoku doku, List<SolverStep> steps) {
 		if (Thread.interrupted())
 			throw new CancellationException("User wants to stop the solver");
 
@@ -34,14 +34,14 @@ public class BacktrackingSolver implements Solver {
 		}
 
 		for (int symbol : possibleSymbols) {
-
 			cellToFill.setSymbolIndex(symbol);
-			if (this.solve(doku)) {
+			addStep(cellToFill, steps);
+			if (this.solve(doku, steps)) {
 				return true;
 			} else {
 				cellToFill.setSymbolIndex(Cell.NOSYMBOL);
+				addStep(cellToFill, steps);
 			}
-
 		}
 		return false;
 	}

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

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -19,7 +19,7 @@ public class HumanSolver implements Solver {
 	 * @return boolean, valant true si le MultiDoku est résolu, false sinon.
 	 */
 	@Override
-	public boolean solve(MultiDoku doku) {
+	public boolean solve(MultiDoku doku, List<SolverStep> steps) {
 		if (Thread.interrupted())
 			throw new CancellationException("User wants to stop the solver");
 
@@ -47,8 +47,9 @@ public class HumanSolver implements Solver {
 			}
 
 			cellToFill.setSymbolIndex(possibleSymbols.getFirst());
+			addStep(cellToFill, steps);
 
-			return this.solve(doku);
+			return this.solve(doku, steps);
 		}
 
 		return doku.isSolved();

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

@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -21,7 +21,7 @@ public class MixedSolver implements Solver{
      * @return boolean, valant true si le MultiDoku est résolu, false sinon.
      */
     @Override
-    public boolean solve(MultiDoku doku) {
+    public boolean solve(MultiDoku doku, List<SolverStep> steps) {
         Random rand = new Random();
 
         if (Thread.interrupted()) {
@@ -49,7 +49,8 @@ public class MixedSolver implements Solver{
 
         if (possibleSymbols.size() == 1) {
             cellToFill.setSymbolIndex(possibleSymbols.getFirst());
-            if (this.solve(doku)) {
+            addStep(cellToFill, steps);
+            if (this.solve(doku, steps)) {
                 return true;
             }
         }
@@ -59,10 +60,12 @@ public class MixedSolver implements Solver{
             int nextSymbol = possibleSymbols.get(nextPossibleSymbolIndex);
 
             cellToFill.setSymbolIndex(nextSymbol);
-            if (this.solve(doku)) {
+            addStep(cellToFill, steps);
+            if (this.solve(doku, steps)) {
                 return true;
             }
             cellToFill.setSymbolIndex(Cell.NOSYMBOL);
+            addStep(cellToFill, steps);
             possibleSymbols.remove(nextPossibleSymbolIndex);
 
         }

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

@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
@@ -22,7 +22,7 @@ public class RandomSolver implements Solver {
      * @return boolean, true s'il est résolu ou false s'il ne l'est pas.
      */
     @Override
-    public boolean solve(MultiDoku doku) {
+    public boolean solve(MultiDoku doku, List<SolverStep> steps) {
         Random rand = new Random();
 
         if (Thread.interrupted())
@@ -51,10 +51,12 @@ public class RandomSolver implements Solver {
             int nextSymbol = possibleSymbols.get(nextPossibleSymbolIndex);
 
             cellToFill.setSymbolIndex(nextSymbol);
-            if (this.solve(doku)) {
+            addStep(cellToFill, steps);
+            if (this.solve(doku, steps)) {
                 return true;
             }
             cellToFill.setSymbolIndex(Cell.NOSYMBOL);
+            addStep(cellToFill, steps);
             possibleSymbols.remove(nextPossibleSymbolIndex);
 
         }

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

@@ -13,7 +13,11 @@ public interface Solver {
      */
     public static final Logger logger = Logger.getLogger("SolverLogger");
 
-	boolean solve(MultiDoku doku);
+    boolean solve(MultiDoku doku, List<SolverStep> solverSteps);
+
+    default boolean solve(MultiDoku doku) {
+        return solve(doku, null);
+    }
 
     /**
      * Compte le nombre de solutions possibles au MultiDoku passé en paramètres.
@@ -38,10 +42,20 @@ public interface Solver {
             cellToFill.setSymbolIndex(symbol);
             if (solve(doku)) {
                 result++;
+                if (result > 1) {
+                    doku.getStateManager().popState();
+                    return result;
+                }
             }
             doku.getStateManager().popState();
         }
         return result;
     }
 
+    default void addStep(Cell cell, List<SolverStep> steps) {
+        if (steps == null)
+            return;
+        steps.add(new SolverStep(cell));
+    }
+
 }

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

@@ -0,0 +1,23 @@
+package sudoku.solver;
+
+import sudoku.structure.Cell;
+
+public class SolverStep {
+
+	private final Cell cell;
+	private final int newValue;
+
+	public SolverStep(Cell cell) {
+		this.cell = cell;
+		this.newValue = cell.getSymbolIndex();
+	}
+
+	public int getNewValue() {
+		return newValue;
+	}
+
+	public Cell getCell() {
+		return cell;
+	}
+
+}

app/src/main/java/sudoku/structure/Sudoku.java

@@ -1,13 +1,11 @@
 package sudoku.structure;
 
-import sudoku.constraint.BlockConstraint;
-import sudoku.constraint.Constraint;
-import sudoku.constraint.IConstraint;
-import sudoku.io.SudokuPrinter;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import sudoku.constraint.Constraint;
+import sudoku.constraint.IConstraint;
+
 /**
  * @class Sudoku
  * @brief Représent un Sudoku
@@ -309,7 +307,7 @@ public class Sudoku {
 	}
 
 	public boolean hasConstraint(Constraint constraint) {
-		return this.constraints.contains(constraint);
+		return this.constraints.contains(constraint.getConstraint());
 	}
 
 }

app/src/main/java/sudoku/structure/SudokuFactory.java

@@ -142,21 +142,14 @@ public class SudokuFactory {
 
 		List<Cell> cellsThatCanBeEmptied = doku.getFilledCells();
 
-		while (!cellsThatCanBeEmptied.isEmpty()) {
 		int index = random.nextInt(cellsThatCanBeEmptied.size());
 		Cell cellToEmpty = cellsThatCanBeEmptied.get(index);
 
-			int oldSymbol = cellToEmpty.empty();
+		cellToEmpty.empty();
 
 		int nbDokuSultions = solver.countSolution(doku);
 		if (nbDokuSultions == 1) {
-				if (newDokuFromFilledOne(doku, --nbCellsToEmpty, solver)) {
+            return newDokuFromFilledOne(doku, --nbCellsToEmpty, solver);
-					return true;
-				}
-			}
-
-			cellToEmpty.setSymbolIndex(oldSymbol);
-			cellsThatCanBeEmptied.remove(cellToEmpty);
 		}
 
 		return false;
@@ -241,24 +234,7 @@ public class SudokuFactory {
 	public static MultiDoku createBasicXShapedMultidoku(int size, List<IConstraint> constraints) {
 		assert (size > 1);
 
-		/*
+		return createBasicXShapedMultidoku(size, size, constraints);
-		 * 2 3
-		 * 1
-		 * 4 5
-		 */
-
-		Sudoku sudoku1 = createSquareSudoku(size, constraints);
-		Sudoku sudoku2 = createSquareSudoku(size, constraints);
-		Sudoku sudoku3 = createSquareSudoku(size, constraints);
-		Sudoku sudoku4 = createSquareSudoku(size, constraints);
-		Sudoku sudoku5 = createSquareSudoku(size, constraints);
-
-		linkRectangleSudokus(sudoku1, sudoku2, new Coordinate(1 - size, 1 - size));
-		linkRectangleSudokus(sudoku1, sudoku3, new Coordinate(size - 1, 1 - size));
-		linkRectangleSudokus(sudoku1, sudoku4, new Coordinate(1 - size, size - 1));
-		linkRectangleSudokus(sudoku1, sudoku5, new Coordinate(size - 1, size - 1));
-
-		return new MultiDoku(Arrays.asList(sudoku1, sudoku2, sudoku3, sudoku4, sudoku5));
 	}
 
 	/**
@@ -294,6 +270,55 @@ public class SudokuFactory {
 		return new MultiDoku(Arrays.asList(sudoku1, sudoku2, sudoku3, sudoku4, sudoku5));
 	}
 
+	/**
+	 * TODO
+	 * Créée un MultiDoku de Blocks carrés de taille size composé de cinq Sudokus,
+	 * dont un central qui partage chacun de ses Blockss d'angle avec un autre
+	 * Sudoku.
+	 *
+	 * @param size int, largeur des Blocks unitraires des Sudokus à crééer.
+	 * @return MultiDoku, MultiDoku de forme X.
+	 */
+	public static MultiDoku createBasicPlusShapedMultidoku(int size, List<IConstraint> constraints) {
+		assert (size > 1);
+
+		return createBasicPlusShapedMultidoku(size, size, constraints);
+	}
+
+	/**
+	 * TODO
+	 * Créée un MultiDoku de Blocks rectangulaires de forme width par height composé
+	 * de cinq Sudokus,
+	 * dont un central qui partage chacun de ses Blocks d'angle avec un autre
+	 * Sudoku.
+	 *
+	 * @param width  int, largeur des Blocks unitraires des Sudokus à crééer.
+	 * @param height int, hauteur des Blocks unitraires des Sudokus à crééer.
+	 * @return MultiDoku, MultiDoku de forme X.
+	 */
+	public static MultiDoku createBasicPlusShapedMultidoku(int width, int height, List<IConstraint> constraints) {
+		assert (width > 1 && height > 1);
+
+		/*
+		 *   3
+		 * 2 1 4
+		 *   5
+		 */
+
+		Sudoku sudoku1 = createRectangleSudoku(width, height, constraints);
+		Sudoku sudoku2 = createRectangleSudoku(width, height, constraints);
+		Sudoku sudoku3 = createRectangleSudoku(width, height, constraints);
+		Sudoku sudoku4 = createRectangleSudoku(width, height, constraints);
+		Sudoku sudoku5 = createRectangleSudoku(width, height, constraints);
+
+		linkRectangleSudokus(sudoku1, sudoku2, new Coordinate(1 - height, 0));
+		linkRectangleSudokus(sudoku1, sudoku3, new Coordinate(0, 1 - width));
+		linkRectangleSudokus(sudoku1, sudoku4, new Coordinate(height - 1, 0));
+		linkRectangleSudokus(sudoku1, sudoku5, new Coordinate(0, width - 1));
+
+		return new MultiDoku(Arrays.asList(sudoku1, sudoku2, sudoku3, sudoku4, sudoku5));
+	}
+
 	public static void fillDoku(MultiDoku doku, Difficulty difficulty) throws Exception {
 		Solver solver = new RandomSolver();
 		solver.solve(doku);
@@ -316,8 +341,7 @@ public class SudokuFactory {
 	public static MultiDoku createBasicEmptyRandomBlockDoku(int blockSize, List<IConstraint> constraints) {
 		int blockCellCount = blockSize * blockSize;
 		List<Cell> cells = initCells(blockCellCount);
-		List<Cell> homeLessCells = new ArrayList<>();
+        List<Cell> homeLessCells = new ArrayList<>(cells);
-		homeLessCells.addAll(cells);
 		List<Block> blocks = new ArrayList<>();
 		Random r = new Random();
 		for (int i = 0; i < blockCellCount; i++) {

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

@@ -1,7 +1,12 @@
 package sudoku.solver;
 
-import gui.Symbols;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
+
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
 import sudoku.structure.Cell;
@@ -9,17 +14,10 @@ import sudoku.structure.MultiDoku;
 import sudoku.structure.Sudoku;
 import sudoku.structure.SudokuFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.List;
-import java.util.Random;
-
 class SolverTest {
 
 	@Test
 	void solveTest() {
-		Random rand = new Random();
-
 		MultiDoku dokuToTest = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
 		MultiDoku dokuResult = SudokuFactory.createBasicEmptySquareDoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);