merged version

# Conflicts:
#	app/src/main/java/sudoku/io/ConsoleInterface.java
#	app/src/main/java/sudoku/solver/Solver.java

app/build.gradle

@@ -16,14 +16,25 @@ project.ext.os = System.properties['os.name'].toLowerCase().split(" ")[0]
 repositories {
     // Use Maven Central for resolving dependencies.
     mavenCentral()
+    flatDir {
+       dirs("$rootProject.projectDir/libs")
+   }
 }
 
 dependencies {
     // Use JUnit Jupiter for testing.
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
 
+    // This dependency is used by the application.
+    implementation 'com.google.guava:guava:31.1-jre'
+
+    // uml
+    implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.26.2'
+
     implementation 'org.json:json:20250107'
 
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
+
     implementation "io.github.spair:imgui-java-app:1.88.0"
 
     implementation "org.lwjgl:lwjgl-stb:3.3.4"
@@ -33,19 +44,12 @@ dependencies {
 
 application {
     // Define the main class for the application.
-    mainClass = 'org.polytech.ryuk.gui.Main'
+    mainClass = 'gui.Main'
 }
 
-// Add libraries into the final jar
+tasks.named('test') {
-jar {
+    // Use JUnit Platform for unit tests.
-    archiveBaseName = rootProject.getName()
+    useJUnitPlatform()
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    manifest {
-        attributes "Main-Class": application.mainClass
-    }
-    from {
-        configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    } 
 }
 
 run {

app/src/main/java/common/ConsumerSignal.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.common;
+package common;
 
 import java.util.HashSet;
 import java.util.Set;

app/src/main/java/common/Signal.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.common;
+package common;
 
 import java.util.HashSet;
 import java.util.Set;

app/src/main/java/game/Game.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.game;
+package game;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
 
 public class Game {
 

app/src/main/java/game/Player.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.game;
+package game;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import imgui.ImGui;
 import imgui.ImVec2;

app/src/main/java/gui/ColorGenerator.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import imgui.ImFont;
 import imgui.ImFontConfig;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import java.nio.ByteBuffer;
 

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

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.gui;
+package gui;
-
-import org.polytech.ryuk.gui.menu.MainMenu;
-import org.polytech.ryuk.gui.menu.StateMachine;
 
+import gui.menu.MainMenu;
+import gui.menu.StateMachine;
+import imgui.ImGui;
 import imgui.app.Application;
 import imgui.app.Configuration;
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 public class Options {
 

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

@@ -1,15 +1,15 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.polytech.ryuk.sudoku.structure.Block;
+import sudoku.structure.Block;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.Coordinate;
+import sudoku.structure.Coordinate;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class RenderableMultidoku {
 
@@ -47,8 +47,6 @@ public class RenderableMultidoku {
 		return cells.get(index);
 	}
 
-	
-
 	private static record PositionConstraint(Sudoku sudoku1, Sudoku sudoku2, Coordinate offset) {
 	}
 

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

@@ -1,10 +1,10 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import java.util.List;
 
-import org.polytech.ryuk.sudoku.constraint.Constraint;
+import sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.SudokuFactory;;
+import sudoku.structure.SudokuFactory;;
 
 public enum SudokuType {
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui;
+package gui;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import imgui.ImGui;
 

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

@@ -1,12 +1,11 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 
-import org.polytech.ryuk.network.client.Client;
-import org.polytech.ryuk.network.server.Server;
-
 import imgui.ImGui;
+import network.client.Client;
+import network.server.Server;
 
 public class ConnexionStatusView extends BaseView {
 

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

@@ -1,12 +1,11 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
-
-import org.polytech.ryuk.game.Player;
-import org.polytech.ryuk.gui.ColorGenerator;
-import org.polytech.ryuk.gui.widget.SudokuRenderer;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
+import game.Player;
+import gui.ColorGenerator;
+import gui.widget.SudokuRenderer;
 import imgui.ImGui;
 import imgui.ImVec4;
+import sudoku.structure.MultiDoku;
 
 public class EndGameView extends BaseView {
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import imgui.ImGui;
 import imgui.ImVec2;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import java.io.IOException;
 

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

@@ -1,18 +1,17 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
-
-import org.polytech.ryuk.game.Player;
-import org.polytech.ryuk.gui.widget.LeaderboardRenderer;
-import org.polytech.ryuk.gui.widget.MultiPlayerCompleteProgress;
-import org.polytech.ryuk.gui.widget.SudokuRenderer;
-import org.polytech.ryuk.gui.widget.TimerRenderer;
-import org.polytech.ryuk.network.client.Client;
-import org.polytech.ryuk.network.server.Server;
-import org.polytech.ryuk.sudoku.solver.BacktrackingSolver;
-import org.polytech.ryuk.sudoku.solver.Solver;
-import org.polytech.ryuk.sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
+import game.Player;
+import gui.widget.LeaderboardRenderer;
+import gui.widget.MultiPlayerCompleteProgress;
+import gui.widget.SudokuRenderer;
+import gui.widget.TimerRenderer;
 import imgui.ImGui;
+import network.client.Client;
+import network.server.Server;
+import sudoku.solver.BacktrackingSolver;
+import sudoku.solver.Solver;
+import sudoku.structure.Cell;
+import sudoku.structure.MultiDoku;
 
 public class MultiPlayerDokuView extends BaseView {
 

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

@@ -1,13 +1,12 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
-
-import org.polytech.ryuk.game.Player;
-import org.polytech.ryuk.gui.widget.SudokuSelector;
-import org.polytech.ryuk.network.client.Client;
-import org.polytech.ryuk.network.server.Server;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
+import game.Player;
+import gui.widget.SudokuSelector;
 import imgui.ImGui;
 import imgui.type.ImInt;
+import network.client.Client;
+import network.server.Server;
+import sudoku.structure.MultiDoku;
 
 public class MultiPlayerView extends BaseView {
 

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

@@ -1,8 +1,7 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
-
-import org.polytech.ryuk.gui.Options;
-import org.polytech.ryuk.gui.Symbols;
 
+import gui.Options;
+import gui.Symbols;
 import imgui.ImGui;
 import imgui.type.ImInt;
 

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

@@ -1,9 +1,8 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
-
-import org.polytech.ryuk.gui.widget.SudokuSelector;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
 
+import gui.widget.SudokuSelector;
 import imgui.ImGui;
+import sudoku.structure.MultiDoku;
 
 public class SoloMenu extends BaseView {
 

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

@@ -1,9 +1,8 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import java.util.Stack;
 
-import org.polytech.ryuk.gui.AnimatedBackground;
+import gui.AnimatedBackground;
-
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiKey;

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

@@ -1,17 +1,16 @@
-package org.polytech.ryuk.gui.menu;
+package gui.menu;
 
 import java.util.concurrent.CancellationException;
 
-import org.polytech.ryuk.gui.widget.SudokuRenderer;
+import gui.widget.SudokuRenderer;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
-import org.polytech.ryuk.sudoku.solver.BacktrackingSolver;
-import org.polytech.ryuk.sudoku.solver.HumanSolver;
-import org.polytech.ryuk.sudoku.solver.MixedSolver;
-import org.polytech.ryuk.sudoku.solver.Solver;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
-
 import imgui.ImGui;
 import imgui.ImGuiStyle;
+import sudoku.io.SudokuSerializer;
+import sudoku.solver.BacktrackingSolver;
+import sudoku.solver.HumanSolver;
+import sudoku.solver.MixedSolver;
+import sudoku.solver.Solver;
+import sudoku.structure.MultiDoku;
 
 public class SudokuView extends BaseView {
 

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

@@ -1,8 +1,7 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
-
-import org.polytech.ryuk.game.Game;
-import org.polytech.ryuk.game.Player;
 
+import game.Game;
+import game.Player;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;

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

@@ -1,8 +1,7 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
-
-import org.polytech.ryuk.game.Game;
-import org.polytech.ryuk.game.Player;
 
+import game.Game;
+import game.Player;
 import imgui.ImGui;
 import imgui.ImVec2;
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
 
 import imgui.ImGui;
 import imgui.ImVec2;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -6,25 +6,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.polytech.ryuk.common.ConsumerSignal;
+import common.ConsumerSignal;
-import org.polytech.ryuk.common.Signal;
+import common.Signal;
-import org.polytech.ryuk.gui.ColorGenerator;
+import gui.ColorGenerator;
-import org.polytech.ryuk.gui.ColorGenerator.Color;
+import gui.Fonts;
-import org.polytech.ryuk.gui.Fonts;
+import gui.Options;
-import org.polytech.ryuk.gui.Options;
+import gui.RenderableMultidoku;
-import org.polytech.ryuk.gui.RenderableMultidoku;
+import gui.Symbols;
-import org.polytech.ryuk.gui.Symbols;
+import gui.ColorGenerator.Color;
-import org.polytech.ryuk.sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.structure.Block;
-import org.polytech.ryuk.sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
-
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;
 import imgui.flag.ImGuiCol;
 import imgui.flag.ImGuiStyleVar;
+import sudoku.constraint.Constraint;
+import sudoku.structure.Block;
+import sudoku.structure.Cell;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.Sudoku;
 
 public class SudokuRenderer {
 

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

@@ -1,20 +1,19 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.polytech.ryuk.common.ConsumerSignal;
+import common.ConsumerSignal;
-import org.polytech.ryuk.gui.SudokuType;
+import gui.SudokuType;
-import org.polytech.ryuk.sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.structure.Difficulty;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.SudokuFactory;
-
 import imgui.ImGui;
 import imgui.extension.imguifiledialog.ImGuiFileDialog;
 import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
 import imgui.type.ImBoolean;
 import imgui.type.ImInt;
+import sudoku.constraint.Constraint;
+import sudoku.structure.Difficulty;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.SudokuFactory;
 
 public class SudokuSelector {
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.gui.widget;
+package gui.widget;
 
 import java.time.Instant;
 

app/src/main/java/network/Connexion.java

@@ -1,11 +1,11 @@
-package org.polytech.ryuk.network;
+package network;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
 
 public abstract class Connexion implements PacketVisitor {
 	

app/src/main/java/network/ConnexionThread.java

@@ -1,9 +1,9 @@
-package org.polytech.ryuk.network;
+package network;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
 
 public class ConnexionThread extends Thread {
 

app/src/main/java/network/client/Client.java

@@ -1,18 +1,18 @@
-package org.polytech.ryuk.network.client;
+package network.client;
 
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Random;
 
-import org.polytech.ryuk.common.ConsumerSignal;
+import common.ConsumerSignal;
-import org.polytech.ryuk.common.Signal;
+import common.Signal;
-import org.polytech.ryuk.game.Game;
+import game.Game;
-import org.polytech.ryuk.game.Player;
+import game.Player;
-import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import network.protocol.packets.ChangeCellPacket;
-import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import network.protocol.packets.LoginPacket;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class Client {
 	private final ClientConnexion clientConnection;

app/src/main/java/network/client/ClientConnexion.java

@@ -1,22 +1,22 @@
-package org.polytech.ryuk.network.client;
+package network.client;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import org.polytech.ryuk.game.Player;
+import game.Player;
-import org.polytech.ryuk.network.Connexion;
+import network.Connexion;
-import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import network.protocol.packets.ChangeCellPacket;
-import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
+import network.protocol.packets.ConnexionInfoPacket;
-import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
+import network.protocol.packets.DisconnectPacket;
-import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import network.protocol.packets.EndGamePacket;
-import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import network.protocol.packets.KeepAlivePacket;
-import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import network.protocol.packets.LoginPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
+import network.protocol.packets.PlayerJoinPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
+import network.protocol.packets.PlayerLeavePacket;
-import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import network.protocol.packets.StartGamePacket;
-import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
+import network.protocol.packets.UpdatePlayerScorePacket;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import sudoku.io.SudokuSerializer;
 
 public class ClientConnexion extends Connexion {
 

app/src/main/java/network/protocol/Packet.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.network.protocol;
+package network.protocol;
 
 import java.io.Serializable;
 

app/src/main/java/network/protocol/PacketVisitor.java

@@ -0,0 +1,31 @@
+package network.protocol;
+
+import network.protocol.packets.ChangeCellPacket;
+import network.protocol.packets.ConnexionInfoPacket;
+import network.protocol.packets.DisconnectPacket;
+import network.protocol.packets.EndGamePacket;
+import network.protocol.packets.KeepAlivePacket;
+import network.protocol.packets.LoginPacket;
+import network.protocol.packets.PlayerJoinPacket;
+import network.protocol.packets.PlayerLeavePacket;
+import network.protocol.packets.StartGamePacket;
+import network.protocol.packets.UpdatePlayerScorePacket;
+
+public interface PacketVisitor {
+
+	default void visit(Packet packet) {
+		packet.accept(this);
+	}
+	
+	void visitPacket(ConnexionInfoPacket packet);
+	void visitPacket(DisconnectPacket packet);
+	void visitPacket(KeepAlivePacket packet);
+	void visitPacket(LoginPacket packet);
+	void visitPacket(PlayerJoinPacket packet);
+	void visitPacket(PlayerLeavePacket packet);
+	void visitPacket(StartGamePacket packet);
+	void visitPacket(EndGamePacket packet);
+	void visitPacket(UpdatePlayerScorePacket packet);
+	void visitPacket(ChangeCellPacket packet);
+	
+}

app/src/main/java/network/protocol/Packets.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.network.protocol;
+package network.protocol;
 
 public enum Packets {
 

app/src/main/java/network/protocol/packets/ChangeCellPacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class ChangeCellPacket extends Packet {
 

app/src/main/java/network/protocol/packets/ConnexionInfoPacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class ConnexionInfoPacket extends Packet {
 

app/src/main/java/network/protocol/packets/DisconnectPacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class DisconnectPacket extends Packet {
 

app/src/main/java/network/protocol/packets/EndGamePacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class EndGamePacket extends Packet {
 

app/src/main/java/network/protocol/packets/KeepAlivePacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class KeepAlivePacket extends Packet {
 

app/src/main/java/network/protocol/packets/LoginPacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class LoginPacket extends Packet {
 

app/src/main/java/network/protocol/packets/PlayerJoinPacket.java

@@ -1,9 +1,9 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.game.Player;
+import game.Player;
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class PlayerJoinPacket extends Packet{
 

app/src/main/java/network/protocol/packets/PlayerLeavePacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class PlayerLeavePacket extends Packet{
 

app/src/main/java/network/protocol/packets/StartGamePacket.java

@@ -1,10 +1,10 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
 import java.time.Instant;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class StartGamePacket extends Packet {
 

app/src/main/java/network/protocol/packets/UpdatePlayerScorePacket.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.protocol.packets;
+package network.protocol.packets;
 
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.PacketVisitor;
+import network.protocol.PacketVisitor;
-import org.polytech.ryuk.network.protocol.Packets;
+import network.protocol.Packets;
 
 public class UpdatePlayerScorePacket extends Packet {
 

app/src/main/java/network/server/KeepAliveHandler.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.network.server;
+package network.server;
 
 import java.util.Random;
 
-import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import network.protocol.packets.KeepAlivePacket;
 
 public class KeepAliveHandler {
 

app/src/main/java/network/server/Server.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.network.server;
+package network.server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -6,14 +6,14 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.polytech.ryuk.game.Game;
+import game.Game;
-import org.polytech.ryuk.game.Game.GameState;
+import game.Player;
-import org.polytech.ryuk.game.Player;
+import game.Game.GameState;
-import org.polytech.ryuk.network.protocol.Packet;
+import network.protocol.Packet;
-import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import network.protocol.packets.EndGamePacket;
-import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import network.protocol.packets.StartGamePacket;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import sudoku.io.SudokuSerializer;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
 
 public class Server {
 

app/src/main/java/network/server/ServerAcceptThread.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.network.server;
+package network.server;
 
 import java.io.IOException;
 import java.net.Socket;

app/src/main/java/network/server/ServerConnexion.java

@@ -1,25 +1,25 @@
-package org.polytech.ryuk.network.server;
+package network.server;
 
 import java.io.IOException;
 import java.net.Socket;
 
-import org.polytech.ryuk.game.Game;
+import game.Game;
-import org.polytech.ryuk.game.Game.GameState;
+import game.Player;
-import org.polytech.ryuk.game.Player;
+import game.Game.GameState;
-import org.polytech.ryuk.network.Connexion;
+import network.Connexion;
-import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
+import network.protocol.packets.ChangeCellPacket;
-import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
+import network.protocol.packets.ConnexionInfoPacket;
-import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
+import network.protocol.packets.DisconnectPacket;
-import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
+import network.protocol.packets.EndGamePacket;
-import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
+import network.protocol.packets.KeepAlivePacket;
-import org.polytech.ryuk.network.protocol.packets.LoginPacket;
+import network.protocol.packets.LoginPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
+import network.protocol.packets.PlayerJoinPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
+import network.protocol.packets.PlayerLeavePacket;
-import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
+import network.protocol.packets.StartGamePacket;
-import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
+import network.protocol.packets.UpdatePlayerScorePacket;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import sudoku.io.SudokuSerializer;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
 
 public class ServerConnexion extends Connexion {
 

app/src/main/java/network/server/ServerLogicThread.java

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.network.server;
+package network.server;
 
 public class ServerLogicThread extends Thread {
 

app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java

@@ -1,31 +0,0 @@
-package org.polytech.ryuk.network.protocol;
-
-import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket;
-import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket;
-import org.polytech.ryuk.network.protocol.packets.DisconnectPacket;
-import org.polytech.ryuk.network.protocol.packets.EndGamePacket;
-import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket;
-import org.polytech.ryuk.network.protocol.packets.LoginPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket;
-import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket;
-import org.polytech.ryuk.network.protocol.packets.StartGamePacket;
-import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket;
-
-public interface PacketVisitor {
-
-	default void visit(Packet packet) {
-		packet.accept(this);
-	}
-	
-	void visitPacket(ConnexionInfoPacket packet);
-	void visitPacket(DisconnectPacket packet);
-	void visitPacket(KeepAlivePacket packet);
-	void visitPacket(LoginPacket packet);
-	void visitPacket(PlayerJoinPacket packet);
-	void visitPacket(PlayerLeavePacket packet);
-	void visitPacket(StartGamePacket packet);
-	void visitPacket(EndGamePacket packet);
-	void visitPacket(UpdatePlayerScorePacket packet);
-	void visitPacket(ChangeCellPacket packet);
-	
-}

app/src/main/java/org/polytech/ryuk/sudoku/Main.java

@@ -1,17 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-package org.polytech.ryuk.sudoku;
-
-import org.polytech.ryuk.sudoku.io.ConsoleInterface;
-
-public class Main {
-    public String getGreeting() {
-        return "Hello World!";
-    }
-
-    public static void main(String[] args) {
-        ConsoleInterface console = new ConsoleInterface();
-        console.start();
-    }
-}

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java

@@ -1,7 +0,0 @@
-package org.polytech.ryuk.sudoku.io;
-
-public class SudokuFile {
-
-	
-
-}

app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java

@@ -1,51 +0,0 @@
-package org.polytech.ryuk.sudoku.io;
-
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
-
-public class SudokuPrinter {
-
-	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++) {
-				line.append((s.getCell(x, y).getSymbolIndex() + 1)).append(" ");
-				if (x % blockWidth == blockWidth - 1 && x != blockWidth * blockHeight - 1) {
-					line.append("| ");
-				}
-			}
-			line.append("]");
-			System.out.println(line);
-		}
-	}
-
-	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
-			if (y % blockHeight == 0 && y > 0) {
-				result.append("\n");
-			}
-			StringBuilder line = new StringBuilder("[ ");
-			for (int x = 0; x < s.getSize(); x++) {
-				// Ajouter la valeur de la cellule
-				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) {
-					line.append("| ");
-				}
-			}
-			line.append("]");
-			result.append(line).append("\n");
-		}
-		return result.toString();
-	}
-
-	public static void printMultiDoku(final MultiDoku doku, int blockWidth, int blockHeight){
-		// TODO
-	}
-}

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

@@ -0,0 +1,42 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+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();
+    }
+}

app/src/main/java/sudoku/constraint/BlockConstraint.java

@@ -1,7 +1,7 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
-import org.polytech.ryuk.sudoku.structure.Block;
+import sudoku.structure.Block;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class BlockConstraint implements IConstraint{
 

app/src/main/java/sudoku/constraint/ColumnConstraint.java

@@ -1,7 +1,7 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class ColumnConstraint implements IConstraint {
 

app/src/main/java/sudoku/constraint/Constraint.java

@@ -1,8 +1,8 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
 import java.util.List;
 
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public enum Constraint {
 

app/src/main/java/sudoku/constraint/DiagonalConstraint.java

@@ -1,6 +1,6 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class DiagonalConstraint implements IConstraint {
 

app/src/main/java/sudoku/constraint/IConstraint.java

@@ -1,9 +1,9 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public interface IConstraint {
 

app/src/main/java/sudoku/constraint/LineConstraint.java

@@ -1,6 +1,6 @@
-package org.polytech.ryuk.sudoku.constraint;
+package sudoku.constraint;
 
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class LineConstraint implements IConstraint {
 

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

@@ -1,21 +1,29 @@
-package org.polytech.ryuk.sudoku.io;
+package sudoku.io;
+
+import gui.RenderableMultidoku;
+import gui.Symbols;
+import sudoku.constraint.*;
+import sudoku.solver.RandomSolver;
+import sudoku.solver.Solver;
+import sudoku.structure.Difficulty;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.SudokuFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import java.util.Scanner;
 
-import org.polytech.ryuk.sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.solver.RandomSolver;
-import org.polytech.ryuk.sudoku.structure.Difficulty;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
-import org.polytech.ryuk.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();
@@ -27,26 +35,21 @@ public class ConsoleInterface {
             pickSymbols(listSymbols, numberOfSymbols);
         }
         else {
-            // TODO
+            listSymbols = Symbols.Numbers.getSymbols();
-            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.createBasicEmptyRectangleDoku(width, height, listConstraints);
-        }
-        else {
             doku = SudokuFactory.createBasicXShapedMultidoku(width, height, listConstraints);
         }
+        else {
+            doku = SudokuFactory.createBasicEmptyRectangleDoku(width, height, listConstraints);
+        }
+        RenderableMultidoku rm = RenderableMultidoku.fromMultidoku(doku);
         System.out.println("Your sudoku will look like this:");
-        // TODO printMultiDoku method not yet implemented
+        SudokuPrinter.printMultiDoku(rm, listSymbols, width, height);
-        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();
@@ -57,12 +60,7 @@ public class ConsoleInterface {
             generatePartialDoku(doku, difficulty);
         }
         System.out.println("Here's your sudoku !");
-        SudokuPrinter.printMultiDoku(doku, width, height);
+        SudokuPrinter.printMultiDoku(rm, listSymbols, 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/SudokuFile.java

@@ -0,0 +1,7 @@
+package sudoku.io;
+
+public class SudokuFile {
+
+	
+
+}

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

@@ -0,0 +1,123 @@
+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){
+		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(" ");
+			}
+			if (x % blockWidth == blockWidth - 1 && x != blockWidth * blockHeight - 1) {
+				line.append("| ");
+			}
+		}
+		line.append("]");
+		System.out.println(line);
+	}
+}
+
+	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) {
+		StringBuilder result = new StringBuilder();
+		for (int y = 0; y < s.getSize(); y++) {
+			// Ajouter une ligne vide entre les blocs horizontaux
+			if (y % blockHeight == 0 && y > 0) {
+				result.append("\n");
+			}
+			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(" ");
+				}
+
+				// Ajouter un séparateur vertical entre les blocs
+				if (x % blockWidth == blockWidth - 1 && x != s.getSize() - 1) {
+					line.append("| ");
+				}
+			}
+			line.append("]");
+			result.append(line).append("\n");
+		}
+		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);
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.io;
+package sudoku.io;
 
 public class SudokuSave {
 

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.io;
+package sudoku.io;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -10,11 +10,12 @@ import java.util.List;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.polytech.ryuk.sudoku.constraint.Constraint;
+
-import org.polytech.ryuk.sudoku.structure.Block;
+import sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Block;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.Sudoku;
 
 public class SudokuSerializer {
 

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

@@ -1,10 +1,10 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.List;
 import java.util.concurrent.CancellationException;
 
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
 
 public class BacktrackingSolver implements Solver {
 

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

@@ -1,13 +1,13 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import sudoku.io.SudokuPrinter;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class HumanSolver implements Solver {
 

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

@@ -1,14 +1,14 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import sudoku.io.SudokuPrinter;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class MixedSolver implements Solver{
 

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

@@ -1,14 +1,14 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;
 
-import org.polytech.ryuk.sudoku.io.SudokuPrinter;
+import sudoku.io.SudokuPrinter;
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 public class RandomSolver implements Solver {
 

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

@@ -1,10 +1,10 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.polytech.ryuk.sudoku.structure.Cell;
+import sudoku.structure.Cell;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
 
 public interface Solver {
 

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

@@ -1,9 +1,9 @@
-package org.polytech.ryuk.sudoku.solver;
+package sudoku.solver;
 
 import java.util.concurrent.CancellationException;
 
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.structure.MultiDoku;
-import org.polytech.ryuk.sudoku.structure.Sudoku;
+import sudoku.structure.Sudoku;
 
 /**
  * Class de test non utilisé

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 /**
  * Représente les coordonnées d'une Cell

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 //TODO: melvyn va passer par là
 public enum Difficulty {

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import sudoku.io.SudokuSerializer;
 
 /**
  * @class MultiDoku

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,10 +1,13 @@
-package org.polytech.ryuk.sudoku.structure;
+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 org.polytech.ryuk.sudoku.constraint.Constraint;
-
 /**
  * @class Sudoku
  * @brief Représent un Sudoku

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

@@ -1,4 +1,4 @@
-package org.polytech.ryuk.sudoku.structure;
+package sudoku.structure;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,10 +9,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.polytech.ryuk.sudoku.constraint.Constraint;
+import sudoku.constraint.Constraint;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+import sudoku.io.SudokuSerializer;
-import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import sudoku.solver.RandomSolver;
-import org.polytech.ryuk.sudoku.solver.Solver;
+import sudoku.solver.Solver;
 
 public class SudokuFactory {
 

app/src/test/java/sudoku/AppTest.java

@@ -0,0 +1,14 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package sudoku;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class AppTest {
+    @Test void appHasAGreeting() {
+        Main classUnderTest = new Main();
+        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
+    }
+}

app/src/test/java/sudoku/SudokuSerializerTest.java

@@ -8,10 +8,11 @@ import java.util.Random;
 
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
-import org.polytech.ryuk.sudoku.io.SudokuSerializer;
+
-import org.polytech.ryuk.sudoku.solver.RandomSolver;
+import sudoku.io.SudokuSerializer;
-import org.polytech.ryuk.sudoku.structure.MultiDoku;
+import sudoku.solver.RandomSolver;
-import org.polytech.ryuk.sudoku.structure.SudokuFactory;
+import sudoku.structure.MultiDoku;
+import sudoku.structure.SudokuFactory;
 
 public class SudokuSerializerTest {
 

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

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