Ryuk/Sudoku
3
1
Fork 0
Code Issues 8 Pull Requests Actions Projects Releases 1 Wiki Activity

Compare commits

base: Ryuk:3a009256c5b58fde17b12021fa43ad116cf56e01
Branches Tags
Ryuk:master Ryuk:udp Ryuk:sooolve Ryuk:tests Ryuk:createPlusMultiDoku Ryuk:refactor Ryuk:HAAAAAAAAAAA
Ryuk:v1.0
..
compare: Ryuk:refactor
Branches Tags
Ryuk:master Ryuk:udp Ryuk:sooolve Ryuk:tests Ryuk:createPlusMultiDoku Ryuk:refactor Ryuk:HAAAAAAAAAAA
Ryuk:v1.0

1 Commits
3a009256c5 ... refactor

Author SHA1 Message Date
Persson-dev
b87bd5183e create package org.polytech.ryuk
All checks were successful
Linux arm64 / Build (push) Successful in 31s
Details
2025-02-01 14:47:46 +01:00
90 changed files with 1653 additions and 794 deletions
Expand all files Collapse all files

2
app/build.gradle
View File

@@ -33,7 +33,7 @@ dependencies {
application { application {
// Define the main class for the application. // Define the main class for the application.
mainClass = 'gui.Main' mainClass = 'org.polytech.ryuk.gui.Main'
} }
// Add libraries into the final jar // Add libraries into the final jar

572
app/save/save-1.json Normal file
View File

@@ -0,0 +1,572 @@
{
"cells": [
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": 0
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 1,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 0
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 8
}
],
"blocks": [
{"cellIDs": [
0,
1,
2,
9,
10,
11,
18,
19,
20
]},
{"cellIDs": [
3,
4,
5,
12,
13,
14,
21,
22,
23
]},
{"cellIDs": [
6,
7,
8,
15,
16,
17,
24,
25,
26
]},
{"cellIDs": [
27,
28,
29,
36,
37,
38,
45,
46,
47
]},
{"cellIDs": [
30,
31,
32,
39,
40,
41,
48,
49,
50
]},
{"cellIDs": [
33,
34,
35,
42,
43,
44,
51,
52,
53
]},
{"cellIDs": [
54,
55,
56,
63,
64,
65,
72,
73,
74
]},
{"cellIDs": [
57,
58,
59,
66,
67,
68,
75,
76,
77
]},
{"cellIDs": [
60,
61,
62,
69,
70,
71,
78,
79,
80
]}
],
"multidoku": [{
"blockWidth": 3,
"cells": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
31,
32,
33,
34,
35,
36,
37,
38,
39,
40,
41,
42,
43,
44,
45,
46,
47,
48,
49,
50,
51,
52,
53,
54,
55,
56,
57,
58,
59,
60,
61,
62,
63,
64,
65,
66,
67,
68,
69,
70,
71,
72,
73,
74,
75,
76,
77,
78,
79,
80
],
"blocks": [
0,
1,
2,
3,
4,
5,
6,
7,
8
],
"constraints": [
0,
1,
2
]
}]
}

572
app/save/save.json Normal file
View File

@@ -0,0 +1,572 @@
{
"cells": [
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 0,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 0,
"symbolIndex": -1
},
{
"blockID": 1,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 1,
"symbolIndex": -1
},
{
"blockID": 1,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 2,
"symbolIndex": -1
},
{
"blockID": 2,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 2
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 5,
"symbolIndex": -1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"symbolIndex": -1
},
{
"blockID": 3,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 4,
"symbolIndex": -1
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 4,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 5,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 4
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 5
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 8
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 3
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 6
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 6,
"immutable": true,
"symbolIndex": 0
},
{
"blockID": 6,
"symbolIndex": -1
},
{
"blockID": 7,
"immutable": true,
"symbolIndex": 7
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 7,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 1
},
{
"blockID": 8,
"symbolIndex": -1
},
{
"blockID": 8,
"immutable": true,
"symbolIndex": 8
}
],
"blocks": [
{"cellIDs": [
0,
1,
2,
9,
10,
11,
18,
19,
20
]},
{"cellIDs": [
3,
4,
5,
12,
13,
14,
21,
22,
23
]},
{"cellIDs": [
6,
7,
8,
15,
16,
17,
24,
25,
26
]},
{"cellIDs": [
27,
28,
29,
36,
37,
38,
45,
46,
47
]},
{"cellIDs": [
30,
31,
32,
39,
40,
41,
48,
49,
50
]},
{"cellIDs": [
33,
34,
35,
42,
43,
44,
51,
52,
53
]},
{"cellIDs": [
54,
55,
56,
63,
64,
65,
72,
73,
74
]},
{"cellIDs": [
57,
58,
59,
66,
67,
68,
75,
76,
77
]},
{"cellIDs": [
60,
61,
62,
69,
70,
71,
78,
79,
80
]}
],
"multidoku": [{
"blockWidth": 3,
"cells": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
31,
32,
33,
34,
35,
36,
37,
38,
39,
40,
41,
42,
43,
44,
45,
46,
47,
48,
49,
50,
51,
52,
53,
54,
55,
56,
57,
58,
59,
60,
61,
62,
63,
64,
65,
66,
67,
68,
69,
70,
71,
72,
73,
74,
75,
76,
77,
78,
79,
80
],
"blocks": [
0,
1,
2,
3,
4,
5,
6,
7,
8
],
"constraints": [
0,
1,
2
]
}]
}

31
app/src/main/java/network/protocol/PacketVisitor.java
View File

@@ -1,31 +0,0 @@
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);
}

2
app/src/main/java/common/ConsumerSignal.java → app/src/main/java/org/polytech/ryuk/common/ConsumerSignal.java
View File

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

2
app/src/main/java/common/Signal.java → app/src/main/java/org/polytech/ryuk/common/Signal.java
View File

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

4
app/src/main/java/game/Game.java → app/src/main/java/org/polytech/ryuk/game/Game.java
View File

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

2
app/src/main/java/game/Player.java → app/src/main/java/org/polytech/ryuk/game/Player.java
View File

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

2
app/src/main/java/gui/AnimatedBackground.java → app/src/main/java/org/polytech/ryuk/gui/AnimatedBackground.java
View File

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

2
app/src/main/java/gui/ColorGenerator.java → app/src/main/java/org/polytech/ryuk/gui/ColorGenerator.java
View File

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

2
app/src/main/java/gui/Fonts.java → app/src/main/java/org/polytech/ryuk/gui/Fonts.java
View File

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

2
app/src/main/java/gui/Images.java → app/src/main/java/org/polytech/ryuk/gui/Images.java
View File

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

7
app/src/main/java/gui/Main.java → app/src/main/java/org/polytech/ryuk/gui/Main.java
View File

@@ -1,7 +1,8 @@
package gui; package org.polytech.ryuk.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.app.Application; import imgui.app.Application;
import imgui.app.Configuration; import imgui.app.Configuration;

2
app/src/main/java/gui/Options.java → app/src/main/java/org/polytech/ryuk/gui/Options.java
View File

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

14
app/src/main/java/gui/RenderableMultidoku.java → app/src/main/java/org/polytech/ryuk/gui/RenderableMultidoku.java
View File

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

8
app/src/main/java/gui/SudokuType.java → app/src/main/java/org/polytech/ryuk/gui/SudokuType.java
View File

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

2
app/src/main/java/gui/Symbols.java → app/src/main/java/org/polytech/ryuk/gui/Symbols.java
View File

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

2
app/src/main/java/gui/menu/BaseView.java → app/src/main/java/org/polytech/ryuk/gui/menu/BaseView.java
View File

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

7
app/src/main/java/gui/menu/ConnexionStatusView.java → app/src/main/java/org/polytech/ryuk/gui/menu/ConnexionStatusView.java
View File

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

11
app/src/main/java/gui/menu/EndGameView.java → app/src/main/java/org/polytech/ryuk/gui/menu/EndGameView.java
View File

@@ -1,11 +1,12 @@
package gui.menu; package org.polytech.ryuk.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.ImGui;
import imgui.ImVec4; import imgui.ImVec4;
import sudoku.structure.MultiDoku;
public class EndGameView extends BaseView { public class EndGameView extends BaseView {

2
app/src/main/java/gui/menu/MainMenu.java → app/src/main/java/org/polytech/ryuk/gui/menu/MainMenu.java
View File

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

9
app/src/main/java/gui/menu/MultiMenu.java → app/src/main/java/org/polytech/ryuk/gui/menu/MultiMenu.java
View File

@@ -1,4 +1,4 @@
package gui.menu; package org.polytech.ryuk.gui.menu;
import java.io.IOException; import java.io.IOException;
@@ -20,8 +20,7 @@ public class MultiMenu extends BaseView {
private void renderCreate() { private void renderCreate() {
ImVec2 displaySize = ImGui.getIO().getDisplaySize(); ImVec2 displaySize = ImGui.getIO().getDisplaySize();
ImGui.beginChild("##CreateGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f)); ImGui.beginChild("##CreateGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f));
if (ImGui.inputInt("Port", port)) ImGui.inputInt("Port", port);
port.set(Math.clamp(port.get(), 1, 65535));
if (ImGui.button("Créer")) { if (ImGui.button("Créer")) {
try { try {
this.stateMachine.pushState(new ConnexionStatusView(stateMachine, (short) port.get())); this.stateMachine.pushState(new ConnexionStatusView(stateMachine, (short) port.get()));
@@ -36,12 +35,12 @@ public class MultiMenu extends BaseView {
ImVec2 displaySize = ImGui.getIO().getDisplaySize(); ImVec2 displaySize = ImGui.getIO().getDisplaySize();
ImGui.beginChild("##JoinGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f)); ImGui.beginChild("##JoinGame", new ImVec2(displaySize.x / 2.0f, displaySize.y * 8.0f / 9.0f));
ImGui.inputText("Adresse", address); ImGui.inputText("Adresse", address);
if (ImGui.inputInt("Port", port)) ImGui.inputInt("Port", port);
port.set(Math.clamp(port.get(), 1, 65535));
if (ImGui.button("Rejoindre")) { if (ImGui.button("Rejoindre")) {
try { try {
this.stateMachine.pushState(new ConnexionStatusView(stateMachine, address.get(), (short) port.get())); this.stateMachine.pushState(new ConnexionStatusView(stateMachine, address.get(), (short) port.get()));
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }

25
app/src/main/java/gui/menu/MultiPlayerDokuView.java → app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerDokuView.java
View File

@@ -1,17 +1,18 @@
package gui.menu; package org.polytech.ryuk.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 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 { public class MultiPlayerDokuView extends BaseView {

16
app/src/main/java/gui/menu/MultiPlayerView.java → app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerView.java
View File

@@ -1,12 +1,13 @@
package gui.menu; package org.polytech.ryuk.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.ImGui;
import imgui.type.ImInt; import imgui.type.ImInt;
import network.client.Client;
import network.server.Server;
import sudoku.structure.MultiDoku;
public class MultiPlayerView extends BaseView { public class MultiPlayerView extends BaseView {
@@ -68,8 +69,7 @@ public class MultiPlayerView extends BaseView {
} }
private void renderTimer() { private void renderTimer() {
if (ImGui.inputInt("Temps de la partie (minutes)", gameDurationMinutes)) ImGui.inputInt("Temps de la partie (minutes)", gameDurationMinutes);
gameDurationMinutes.set(Math.clamp(gameDurationMinutes.get(), 1, 90));
} }
@Override @Override

7
app/src/main/java/gui/menu/OptionsMenu.java → app/src/main/java/org/polytech/ryuk/gui/menu/OptionsMenu.java
View File

@@ -1,7 +1,8 @@
package gui.menu; package org.polytech.ryuk.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.ImGui;
import imgui.type.ImInt; import imgui.type.ImInt;

7
app/src/main/java/gui/menu/SoloMenu.java → app/src/main/java/org/polytech/ryuk/gui/menu/SoloMenu.java
View File

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

5
app/src/main/java/gui/menu/StateMachine.java → app/src/main/java/org/polytech/ryuk/gui/menu/StateMachine.java
View File

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

58
app/src/main/java/gui/menu/SudokuView.java → app/src/main/java/org/polytech/ryuk/gui/menu/SudokuView.java
View File

@@ -1,18 +1,17 @@
package gui.menu; package org.polytech.ryuk.gui.menu;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import gui.widget.SudokuRenderer; import org.polytech.ryuk.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.ImGui;
import imgui.ImGuiStyle; import imgui.ImGuiStyle;
import sudoku.io.SudokuSerializer;
import sudoku.solver.BacktrackingSolver;
import sudoku.solver.HintHelper;
import sudoku.solver.HumanSolver;
import sudoku.solver.MixedSolver;
import sudoku.solver.Solver;
import sudoku.solver.HintHelper.Hint;
import sudoku.structure.MultiDoku;
public class SudokuView extends BaseView { public class SudokuView extends BaseView {
@@ -22,8 +21,6 @@ public class SudokuView extends BaseView {
private String lastSavePath = null; private String lastSavePath = null;
private boolean resolved = false; private boolean resolved = false;
// if the solver can't solve
private volatile boolean unresolved = false;
public SudokuView(StateMachine stateMachine, MultiDoku doku) { public SudokuView(StateMachine stateMachine, MultiDoku doku) {
super(stateMachine); super(stateMachine);
@@ -72,26 +69,10 @@ public class SudokuView extends BaseView {
stopResolve(); stopResolve();
} }
private void renderHintButton() {
if (!this.resolved && centeredButton("Indice")) {
Hint hint = HintHelper.getHint(this.doku, new BacktrackingSolver());
assert (hint != null);
hint.cell().setSymbolIndex(hint.newValue());
if (this.doku.isSolved())
this.sudokuRenderer.onResolve.emit();
}
}
private void renderUnsolvableText() {
if (this.unresolved)
ImGui.text("Impossible de résoudre avec l'algorithme actuel !");
}
private void startSolve(Solver solver) { private void startSolve(Solver solver) {
resolveThread = new Thread(() -> { resolveThread = new Thread(() -> {
try { try {
unresolved = !solver.solve(this.doku); solver.solve(this.doku);
} catch (CancellationException e) { } catch (CancellationException e) {
System.out.println("The user is bored !"); System.out.println("The user is bored !");
} }
@@ -99,11 +80,6 @@ public class SudokuView extends BaseView {
}); });
} }
private void renderResolvedText() {
if (this.resolved)
ImGui.text("Bravo !");
}
private void renderSolvePopup() { private void renderSolvePopup() {
if (ImGui.beginPopup("solve")) { if (ImGui.beginPopup("solve")) {
if (ImGui.button("Résoudre avec backtrace")) { if (ImGui.button("Résoudre avec backtrace")) {
@@ -127,14 +103,16 @@ public class SudokuView extends BaseView {
ImGui.beginDisabled(); ImGui.beginDisabled();
if (!this.resolved && centeredButton("Résoudre")) { if (!this.resolved && centeredButton("Résoudre")) {
// beginSolve = true;
ImGui.openPopup("solve"); ImGui.openPopup("solve");
} }
if (resolveThread != null) if (resolveThread != null)
ImGui.endDisabled(); ImGui.endDisabled();
renderResolvedText(); if (this.resolved) {
renderUnsolvableText(); ImGui.text("Bravo !");
}
renderSolvePopup(); renderSolvePopup();
} }
@@ -151,17 +129,9 @@ public class SudokuView extends BaseView {
} }
} }
private void renderClearButton() {
if (centeredButton("Effacer")) {
this.doku.clearMutableCells();
}
}
@Override @Override
public void render() { public void render() {
sudokuRenderer.render(); sudokuRenderer.render();
renderHintButton();
renderClearButton();
renderSolveButton(); renderSolveButton();
renderSaveButton(); renderSaveButton();
renderCancelButton(); renderCancelButton();

7
app/src/main/java/gui/widget/LeaderboardRenderer.java → app/src/main/java/org/polytech/ryuk/gui/widget/LeaderboardRenderer.java
View File

@@ -1,7 +1,8 @@
package gui.widget; package org.polytech.ryuk.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.ImGui;
import imgui.ImVec2; import imgui.ImVec2;
import imgui.ImVec4; import imgui.ImVec4;

7
app/src/main/java/gui/widget/MultiPlayerCompleteProgress.java → app/src/main/java/org/polytech/ryuk/gui/widget/MultiPlayerCompleteProgress.java
View File

@@ -1,7 +1,8 @@
package gui.widget; package org.polytech.ryuk.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.ImGui;
import imgui.ImVec2; import imgui.ImVec2;

2
app/src/main/java/gui/widget/SmoothProgressBar.java → app/src/main/java/org/polytech/ryuk/gui/widget/SmoothProgressBar.java
View File

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

33
app/src/main/java/gui/widget/SudokuRenderer.java → app/src/main/java/org/polytech/ryuk/gui/widget/SudokuRenderer.java
View File

@@ -1,4 +1,4 @@
package gui.widget; package org.polytech.ryuk.gui.widget;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -6,24 +6,25 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import common.ConsumerSignal; import org.polytech.ryuk.common.ConsumerSignal;
import common.Signal; import org.polytech.ryuk.common.Signal;
import gui.ColorGenerator; import org.polytech.ryuk.gui.ColorGenerator;
import gui.Fonts; import org.polytech.ryuk.gui.ColorGenerator.Color;
import gui.Options; import org.polytech.ryuk.gui.Fonts;
import gui.RenderableMultidoku; import org.polytech.ryuk.gui.Options;
import gui.Symbols; import org.polytech.ryuk.gui.RenderableMultidoku;
import gui.ColorGenerator.Color; import org.polytech.ryuk.gui.Symbols;
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.ImGui;
import imgui.ImVec2; import imgui.ImVec2;
import imgui.ImVec4; import imgui.ImVec4;
import imgui.flag.ImGuiCol; import imgui.flag.ImGuiCol;
import imgui.flag.ImGuiStyleVar; 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 { public class SudokuRenderer {
@@ -84,7 +85,7 @@ public class SudokuRenderer {
} }
} else { } else {
if (ImGui.button(Options.Symboles.getSymbols().get(i), cellSize)) { if (ImGui.button(Options.Symboles.getSymbols().get(i), cellSize)) {
currentCell.setSymbolIndex(i); if (currentCell.trySetValue(i))
this.onCellChange.emit(currentCell); this.onCellChange.emit(currentCell);
if (this.doku.getDoku().isSolved()) if (this.doku.getDoku().isSolved())
this.onResolve.emit(); this.onResolve.emit();
@@ -117,7 +118,6 @@ public class SudokuRenderer {
ImGui.sameLine(); ImGui.sameLine();
int index = y * doku.getWidth() + x; int index = y * doku.getWidth() + x;
Cell cell = doku.getCell(x, y); Cell cell = doku.getCell(x, y);
ImGui.beginDisabled(cell == null);
if (cell == null) { if (cell == null) {
ImGui.pushStyleColor(ImGuiCol.Border, TRANSPARENT); ImGui.pushStyleColor(ImGuiCol.Border, TRANSPARENT);
ImGui.pushStyleColor(ImGuiCol.Button, TRANSPARENT); ImGui.pushStyleColor(ImGuiCol.Button, TRANSPARENT);
@@ -142,7 +142,6 @@ public class SudokuRenderer {
currentCell = cell; currentCell = cell;
} }
} }
ImGui.endDisabled();
ImGui.popStyleColor(2); ImGui.popStyleColor(2);
} }
} }

26
app/src/main/java/gui/widget/SudokuSelector.java → app/src/main/java/org/polytech/ryuk/gui/widget/SudokuSelector.java
View File

@@ -1,19 +1,20 @@
package gui.widget; package org.polytech.ryuk.gui.widget;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import common.ConsumerSignal; import org.polytech.ryuk.common.ConsumerSignal;
import gui.SudokuType; import org.polytech.ryuk.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.ImGui;
import imgui.extension.imguifiledialog.ImGuiFileDialog; import imgui.extension.imguifiledialog.ImGuiFileDialog;
import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags; import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
import imgui.type.ImBoolean; import imgui.type.ImBoolean;
import imgui.type.ImInt; import imgui.type.ImInt;
import sudoku.constraint.Constraint;
import sudoku.structure.Difficulty;
import sudoku.structure.MultiDoku;
import sudoku.structure.SudokuFactory;
public class SudokuSelector { public class SudokuSelector {
@@ -24,7 +25,7 @@ public class SudokuSelector {
private final ImInt sudokuType = new ImInt(0); private final ImInt sudokuType = new ImInt(0);
private final ImInt difficulty = new ImInt(Difficulty.Easy.ordinal()); private final ImInt difficulty = new ImInt(Difficulty.Medium.ordinal());
private final List<ImBoolean> contraints = new ArrayList<>(); private final List<ImBoolean> contraints = new ArrayList<>();
private final ImInt sudokuSize = new ImInt(3); private final ImInt sudokuSize = new ImInt(3);
@@ -98,8 +99,7 @@ public class SudokuSelector {
SudokuType currentType = SudokuType.values()[sudokuType.get()]; SudokuType currentType = SudokuType.values()[sudokuType.get()];
switch (currentType.getMakerParamCount()) { switch (currentType.getMakerParamCount()) {
case 1: case 1:
if (ImGui.inputInt("Taille", sudokuSize)) ImGui.inputInt("Taille", sudokuSize);
sudokuSize.set(Math.clamp(sudokuSize.get(), 1, 10));
if (ImGui.button(confirmMessage)) { if (ImGui.button(confirmMessage)) {
selectSudoku(currentType.createDoku(getConstraints(), sudokuSize.get()), false); selectSudoku(currentType.createDoku(getConstraints(), sudokuSize.get()), false);
} }
@@ -109,10 +109,8 @@ public class SudokuSelector {
break; break;
case 2: case 2:
if (ImGui.inputInt("Longueur", sudokuWidth)) ImGui.inputInt("Largeur", sudokuHeight);
sudokuWidth.set(Math.clamp(sudokuWidth.get(), 1, 10)); ImGui.inputInt("Longueur", sudokuWidth);
if (ImGui.inputInt("Hauteur", sudokuHeight))
sudokuHeight.set(Math.clamp(sudokuHeight.get(), 1, 10));
if (ImGui.button(confirmMessage)) { if (ImGui.button(confirmMessage)) {
selectSudoku(currentType.createDoku(getConstraints(), sudokuWidth.get(), sudokuHeight.get()), selectSudoku(currentType.createDoku(getConstraints(), sudokuWidth.get(), sudokuHeight.get()),
false); false);

2
app/src/main/java/gui/widget/TimerRenderer.java → app/src/main/java/org/polytech/ryuk/gui/widget/TimerRenderer.java
View File

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

6
app/src/main/java/network/Connexion.java → app/src/main/java/org/polytech/ryuk/network/Connexion.java
View File

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

4
app/src/main/java/network/ConnexionThread.java → app/src/main/java/org/polytech/ryuk/network/ConnexionThread.java
View File

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

20
app/src/main/java/network/client/Client.java → app/src/main/java/org/polytech/ryuk/network/client/Client.java
View File

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

28
app/src/main/java/network/client/ClientConnexion.java → app/src/main/java/org/polytech/ryuk/network/client/ClientConnexion.java
View File

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

2
app/src/main/java/network/protocol/Packet.java → app/src/main/java/org/polytech/ryuk/network/protocol/Packet.java
View File

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

31
app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java Normal file
View File

@@ -0,0 +1,31 @@
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);
}

2
app/src/main/java/network/protocol/Packets.java → app/src/main/java/org/polytech/ryuk/network/protocol/Packets.java
View File

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

8
app/src/main/java/network/protocol/packets/ChangeCellPacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/ChangeCellPacket.java
View File

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

8
app/src/main/java/network/protocol/packets/ConnexionInfoPacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/ConnexionInfoPacket.java
View File

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

8
app/src/main/java/network/protocol/packets/DisconnectPacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/DisconnectPacket.java
View File

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

8
app/src/main/java/network/protocol/packets/EndGamePacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/EndGamePacket.java
View File

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

8
app/src/main/java/network/protocol/packets/KeepAlivePacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/KeepAlivePacket.java
View File

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

8
app/src/main/java/network/protocol/packets/LoginPacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/LoginPacket.java
View File

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

10
app/src/main/java/network/protocol/packets/PlayerJoinPacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerJoinPacket.java
View File

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

8
app/src/main/java/network/protocol/packets/PlayerLeavePacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerLeavePacket.java
View File

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

8
app/src/main/java/network/protocol/packets/StartGamePacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/StartGamePacket.java
View File

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

8
app/src/main/java/network/protocol/packets/UpdatePlayerScorePacket.java → app/src/main/java/org/polytech/ryuk/network/protocol/packets/UpdatePlayerScorePacket.java
View File

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

4
app/src/main/java/network/server/KeepAliveHandler.java → app/src/main/java/org/polytech/ryuk/network/server/KeepAliveHandler.java
View File

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

18
app/src/main/java/network/server/Server.java → app/src/main/java/org/polytech/ryuk/network/server/Server.java
View File

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

2
app/src/main/java/network/server/ServerAcceptThread.java → app/src/main/java/org/polytech/ryuk/network/server/ServerAcceptThread.java
View File

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

36
app/src/main/java/network/server/ServerConnexion.java → app/src/main/java/org/polytech/ryuk/network/server/ServerConnexion.java
View File

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

2
app/src/main/java/network/server/ServerLogicThread.java → app/src/main/java/org/polytech/ryuk/network/server/ServerLogicThread.java
View File

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

17
app/src/main/java/org/polytech/ryuk/sudoku/Main.java Normal file
View File

@@ -0,0 +1,17 @@
/*
* 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();
}
}

6
app/src/main/java/sudoku/constraint/BlockConstraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/BlockConstraint.java
View File

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

6
app/src/main/java/sudoku/constraint/ColumnConstraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/ColumnConstraint.java
View File

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

4
app/src/main/java/sudoku/constraint/Constraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/Constraint.java
View File

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

4
app/src/main/java/sudoku/constraint/DiagonalConstraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/DiagonalConstraint.java
View File

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

4
app/src/main/java/sudoku/constraint/IConstraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/IConstraint.java
View File

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

4
app/src/main/java/sudoku/constraint/LineConstraint.java → app/src/main/java/org/polytech/ryuk/sudoku/constraint/LineConstraint.java
View File

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

122
app/src/main/java/sudoku/io/ConsoleInterface.java → app/src/main/java/org/polytech/ryuk/sudoku/io/ConsoleInterface.java
View File

@@ -1,65 +1,54 @@
package sudoku.io; package org.polytech.ryuk.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.ArrayList;
import java.util.List; import java.util.List;
import java.util.Scanner; 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 class ConsoleInterface {
public Scanner reader = new Scanner(System.in); public Scanner reader = new Scanner(System.in);
public void welcome(){ public void start(){
System.out.println("Welcome to our Sudoku Solver!"); welcome();
System.out.println("This is the project of Melvyn Bauvent, Lilas Grenier and Simon Priblyski.");
System.out.println("Do you have a save sudoku you would like to continue? (y/n, default n)");
if (reader.next().equalsIgnoreCase("y")){
useSavedDoku();
}
else {
createDoku();
}
}
private void useSavedDoku() {
System.out.println("What save should we use? Please enter the save number.");
MultiDoku md = saveChoice();
int blockWidth = md.getSubGrid(0).getBlockWidth();
int blockHeight = md.getSubGrid(0).getBlocks().getFirst().getCells().size() / blockWidth;
List<String> listSymbols = pickSymbols(blockWidth*blockHeight);
System.out.println("This is the saved sudoku:");
showMultidoku(md, listSymbols, blockWidth, blockHeight);
}
public void createDoku(){
System.out.println("First of all, you need to tell me the size of the sudoku you want to generate."); System.out.println("First of all, you need to tell me the size of the sudoku you want to generate.");
int width = getBlockWidth(); int width = getBlockWidth();
int height = getBlockHeight(); int height = getBlockHeight();
System.out.println("Your sudoku will have blocks of a " + width + " x " + height + " format."); System.out.println("Your sudoku will have blocks of a " + width + " x " + height + " format.");
int numberOfSymbols = width * height; int numberOfSymbols = width * height;
List<String> listSymbols = pickSymbols(numberOfSymbols); System.out.println("Would you like to pick the " + numberOfSymbols + " symbols from the sudoku? (y/n, default 'no' will use numbers)" );
List<Constraint> listConstraints = getListConstraints(); List<String> listSymbols = new ArrayList<>();
System.out.println("Now that we have the size of our sudoku, " + if(reader.next().equalsIgnoreCase("y")){
"would you rather have a single grid ('one', default), " + pickSymbols(listSymbols, numberOfSymbols);
"or a a multidoku composed of 5 subgrids ('multi') ?");
MultiDoku doku;
if (reader.next().equalsIgnoreCase("multi")) {
doku = SudokuFactory.createBasicXShapedMultidoku(width, height, listConstraints);
} }
else { else {
// 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.createBasicEmptyRectangleDoku(width, height, listConstraints); doku = SudokuFactory.createBasicEmptyRectangleDoku(width, height, listConstraints);
} }
else {
doku = SudokuFactory.createBasicXShapedMultidoku(width, height, listConstraints);
}
System.out.println("Your sudoku will look like this:"); System.out.println("Your sudoku will look like this:");
showMultidoku(doku, 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("We now will fill this sudoku.");
System.out.println("What level of difficulty would you like?" + System.out.println("What level of difficulty would you like? ('very easy', 'easy', 'medium' (default), 'hard', 'full' (sudoku fully completed))");
" ('very easy', 'easy', 'medium' (default), 'hard', 'full' (sudoku fully completed))");
String difficulty = reader.next().toLowerCase(); String difficulty = reader.next().toLowerCase();
if (difficulty.equals("full")) { if (difficulty.equals("full")) {
generateFullDoku(doku); generateFullDoku(doku);
@@ -68,23 +57,12 @@ public class ConsoleInterface {
generatePartialDoku(doku, difficulty); generatePartialDoku(doku, difficulty);
} }
System.out.println("Here's your sudoku !"); System.out.println("Here's your sudoku !");
showMultidoku(doku, listSymbols, width, height); SudokuPrinter.printMultiDoku(doku, width, height);
System.out.println("You can now save it!");
saveMultiDoku(doku);
} }
private MultiDoku saveChoice() { public void welcome(){
int nbSave; System.out.println("Welcome to our Sudoku Solver!");
MultiDoku md = null; System.out.println("This is the project of Melvyn Bauvent, Lilas Grenier and Simon Priblyski.");
do {
nbSave = reader.nextInt();
try {
md = SudokuSerializer.getSavedMultiDoku(nbSave);
} catch (Exception e) {
System.out.println("There seems to be a problem with this save, please try again.");
}
} while (md == null);
return md;
} }
public int getBlockWidth() { public int getBlockWidth() {
@@ -115,10 +93,7 @@ public class ConsoleInterface {
return (size > 0); return (size > 0);
} }
private List<String> pickSymbols(int numberOfSymbols) { private void pickSymbols(List<String> listSymbols, int numberOfSymbols) {
System.out.println("Would you like to pick the " + numberOfSymbols + " symbols from the sudoku? (y/n, default 'no' will use numbers)");
if (reader.next().equalsIgnoreCase("y")) {
List<String> listSymbols = new ArrayList<>();
System.out.println("You have chosen to pick your own symbols."); System.out.println("You have chosen to pick your own symbols.");
for (int i = 0; i < numberOfSymbols; i++) { for (int i = 0; i < numberOfSymbols; i++) {
System.out.println("Choose for the symbol number " + i + ": "); System.out.println("Choose for the symbol number " + i + ": ");
@@ -130,15 +105,6 @@ public class ConsoleInterface {
listSymbols.add(newSymbol); listSymbols.add(newSymbol);
} }
System.out.println("You chose the symbols: " + listSymbols.toString()); System.out.println("You chose the symbols: " + listSymbols.toString());
return listSymbols;
} else {
System.out.println("What existing sets of symbols do you want to use? Numbers ('n', default), letters ('l'), or emojis ('e')?");
return switch (reader.next().toLowerCase()) {
case "l" -> Symbols.Letters.getSymbols();
case "e" -> Symbols.Emojis.getSymbols();
default -> Symbols.Numbers.getSymbols();
};
}
} }
private List<Constraint> getListConstraints() { private List<Constraint> getListConstraints() {
@@ -169,18 +135,4 @@ public class ConsoleInterface {
new RandomSolver().solve(doku); new RandomSolver().solve(doku);
} }
private void showMultidoku(MultiDoku doku, List<String> listSymbols, int width, int height){
showMultiDoku(RenderableMultidoku.fromMultidoku(doku), listSymbols, width, height);
}
private void showMultiDoku(RenderableMultidoku doku, List<String> listSymbols, int width, int height){
SudokuPrinter.printMultiDoku(doku, listSymbols, width, height);
}
private void saveMultiDoku(MultiDoku doku){
System.out.println("Number of the file to overwrite ('-1' or unused save file number to create a new save) :");
int n = reader.nextInt();
String path = SudokuSerializer.saveMultiDoku(doku, n);
System.out.println("The path to your save is:" + path);
}
} }

7
app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java Normal file
View File

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

51
app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java Normal file
View File

@@ -0,0 +1,51 @@
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
}
}

2
app/src/main/java/sudoku/io/SudokuSave.java → app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSave.java
View File

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

38
app/src/main/java/sudoku/io/SudokuSerializer.java → app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSerializer.java
View File

@@ -1,4 +1,4 @@
package sudoku.io; package org.polytech.ryuk.sudoku.io;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
@@ -10,12 +10,11 @@ import java.util.List;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import org.polytech.ryuk.sudoku.constraint.Constraint;
import sudoku.constraint.Constraint; 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.MultiDoku;
import sudoku.structure.MultiDoku; import org.polytech.ryuk.sudoku.structure.Sudoku;
import sudoku.structure.Sudoku;
public class SudokuSerializer { public class SudokuSerializer {
@@ -124,13 +123,17 @@ public class SudokuSerializer {
* @return String, the path of the save. * @return String, the path of the save.
*/ */
public static String saveMultiDoku(final MultiDoku doku) { public static String saveMultiDoku(final MultiDoku doku) {
JSONObject jsonRoot = serializeSudoku(doku); JSONObject jsonRoot = serializeSudoku(doku);
File f = new File("save", "save.json"); File f = new File("save", "save.json");
int i = 0; int i = 0;
while (f.exists()) { while (f.exists()) {
String newName = "save-" + ++i + ".json"; String newName = "save-" + ++i + ".json";
f = new File("save", newName); f = new File("save", newName);
} }
try (FileWriter file = new FileWriter(f)) { try (FileWriter file = new FileWriter(f)) {
file.write(jsonRoot.toString(3)); file.write(jsonRoot.toString(3));
} catch (IOException e) { } catch (IOException e) {
@@ -139,27 +142,6 @@ public class SudokuSerializer {
return f.getAbsolutePath(); return f.getAbsolutePath();
} }
public static String saveMultiDoku(final MultiDoku doku, final int saveToOverwrite) {
File f;
if (saveToOverwrite == 0) {
f = new File("save", "save.json");
}
else {
f = new File("save", "save-" + saveToOverwrite + ".json");
}
if (!f.exists()) {
return saveMultiDoku(doku);
}
else {
try (FileWriter file = new FileWriter(f)) {
file.write(serializeSudoku(doku).toString(3));
} catch (IOException e) {
e.printStackTrace();
}
return f.getAbsolutePath();
}
}
/** /**
* Get a MultiDoku from a pre-existing json save file. * Get a MultiDoku from a pre-existing json save file.
* *

6
app/src/main/java/sudoku/solver/BacktrackingSolver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/BacktrackingSolver.java
View File

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

14
app/src/main/java/sudoku/solver/HumanSolver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/HumanSolver.java
View File

@@ -1,14 +1,13 @@
package sudoku.solver; package org.polytech.ryuk.sudoku.solver;
import java.util.List; import java.util.List;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.logging.Level; import java.util.logging.Level;
import gui.Symbols; 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 { public class HumanSolver implements Solver {
@@ -27,8 +26,7 @@ public class HumanSolver implements Solver {
logger.log(Level.FINE, logger.log(Level.FINE,
'\n' + SudokuPrinter.toStringRectangleSudoku(sudoku, '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
Symbols.Numbers));
if (doku.isSolved()) { if (doku.isSolved()) {
return true; return true;

14
app/src/main/java/sudoku/solver/MixedSolver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/MixedSolver.java
View File

@@ -1,15 +1,14 @@
package sudoku.solver; package org.polytech.ryuk.sudoku.solver;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.logging.Level; import java.util.logging.Level;
import gui.Symbols; 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{ public class MixedSolver implements Solver{
@@ -33,8 +32,7 @@ public class MixedSolver implements Solver{
'\n' + SudokuPrinter.toStringRectangleSudoku( '\n' + SudokuPrinter.toStringRectangleSudoku(
sudoku, sudoku,
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
Symbols.Numbers));
if (doku.isSolved()) { if (doku.isSolved()) {
return true; return true;

15
app/src/main/java/sudoku/solver/RandomSolver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/RandomSolver.java
View File

@@ -1,15 +1,14 @@
package sudoku.solver; package org.polytech.ryuk.sudoku.solver;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.logging.Level; import java.util.logging.Level;
import gui.Symbols; 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 { public class RandomSolver implements Solver {
@@ -19,6 +18,7 @@ public class RandomSolver implements Solver {
* de backtracking. * de backtracking.
* *
* @param doku Multidoku, à résoudre * @param doku Multidoku, à résoudre
* @param rand Random, pour tester aléatoirement les symboles
* @return boolean, true s'il est résolu ou false s'il ne l'est pas. * @return boolean, true s'il est résolu ou false s'il ne l'est pas.
*/ */
@Override @Override
@@ -32,8 +32,7 @@ public class RandomSolver implements Solver {
logger.log(Level.FINE, logger.log(Level.FINE,
'\n' + SudokuPrinter.toStringRectangleSudoku(sudoku, '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
Symbols.Numbers));
if (doku.isSolved()) { if (doku.isSolved()) {
return true; return true;

6
app/src/main/java/sudoku/solver/Solver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/Solver.java
View File

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

6
app/src/main/java/sudoku/solver/StupidSolver.java → app/src/main/java/org/polytech/ryuk/sudoku/solver/StupidSolver.java
View File

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

2
app/src/main/java/sudoku/structure/Block.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/Block.java
View File

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

2
app/src/main/java/sudoku/structure/Cell.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/Cell.java
View File

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

2
app/src/main/java/sudoku/structure/Coordinate.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/Coordinate.java
View File

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

2
app/src/main/java/sudoku/structure/Difficulty.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/Difficulty.java
View File

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

4
app/src/main/java/sudoku/structure/MultiDoku.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/MultiDoku.java
View File

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

41
app/src/main/java/org/polytech/ryuk/sudoku/structure/StateManager.java Normal file
View File

@@ -0,0 +1,41 @@
package org.polytech.ryuk.sudoku.structure;
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
//TODO: doc
public class StateManager {
private final Stack<Map<Cell, Integer>> states;
private final MultiDoku doku;
public StateManager(MultiDoku doku) {
this.states = new Stack<>();
this.doku = doku;
}
public void pushState() {
states.add(new HashMap<>());
saveState();
}
public void popState() {
assert (states.size() > 0);
restoreState();
states.pop();
}
private void restoreState() {
for (var entry : this.states.getLast().entrySet()) {
entry.getKey().setSymbolIndex(entry.getValue());
}
}
private void saveState() {
for (Cell cell : this.doku.getCells()) {
states.getLast().put(cell, cell.getSymbolIndex());
}
}
}

9
app/src/main/java/sudoku/structure/Sudoku.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/Sudoku.java
View File

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

10
app/src/main/java/sudoku/structure/SudokuFactory.java → app/src/main/java/org/polytech/ryuk/sudoku/structure/SudokuFactory.java
View File

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

53
app/src/main/java/sudoku/Main.java
View File

@@ -1,53 +0,0 @@
/*
* 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.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!";
}
public static void voidTest(){
MultiDoku md = SudokuFactory.createBasicXShapedMultidoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
SudokuPrinter.printMultiDoku(RenderableMultidoku.fromMultidoku(md), Symbols.Numbers, 3, 3);
SudokuSerializer.saveMultiDoku(md);
}
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);
SudokuSerializer.saveMultiDoku(md);
}
public static void overwriteTest(int n){
MultiDoku md = SudokuFactory.createBasicXShapedMultidoku(3, SudokuFactory.DEFAULT_CONSTRAINTS);
new RandomSolver().solve(md);
SudokuPrinter.printMultiDoku(RenderableMultidoku.fromMultidoku(md), Symbols.Numbers, 3, 3);
SudokuSerializer.saveMultiDoku(md, n);
}
public static void main(String[] args) {
ConsoleInterface console = new ConsoleInterface();
/*
voidTest();
filledTest();
overwriteTest(0);
overwriteTest(17)
*/
console.welcome();
}
}

7
app/src/main/java/sudoku/io/SudokuFile.java
View File

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

123
app/src/main/java/sudoku/io/SudokuPrinter.java
View File

@@ -1,123 +0,0 @@
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);
}
}
}

54
app/src/main/java/sudoku/solver/HintHelper.java
View File

@@ -1,54 +0,0 @@
package sudoku.solver;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import sudoku.structure.Cell;
import sudoku.structure.MultiDoku;
public class HintHelper {
public static record Hint(Cell cell, int newValue) {
}
public static Hint getHint(MultiDoku doku, Solver solver) {
doku.getStateManager().pushState();
doku.clearMutableCells();
if (!solver.solve(doku))
return null;
var stateSolved = doku.getStateManager().popAndGetState();
// find differences
Map<Cell, Integer> newValues = new HashMap<>();
for (var entry : stateSolved.entrySet()) {
Cell cell = entry.getKey();
// we only want the cells that can be filled
if (!cell.isMutable())
continue;
int oldValue = cell.getSymbolIndex();
int newValue = stateSolved.get(cell);
if (oldValue == newValue)
continue;
// we have to clear the cell
if (newValue == Cell.NOSYMBOL)
return new Hint(cell, newValue);
// we have to change the cell value
if (oldValue != Cell.NOSYMBOL && newValue != oldValue)
return new Hint(cell, newValue);
// there is a valid move
newValues.put(cell, newValue);
}
// this is too complex just for fetching a random entry, but whatever ...
Random r = new Random();
List<Cell> cells = new ArrayList<>(newValues.keySet());
Cell randomCell = cells.get(r.nextInt(cells.size()));
int randomCellValue = newValues.get(randomCell);
return new Hint(randomCell, randomCellValue);
}
}

49
app/src/main/java/sudoku/structure/StateManager.java
View File

@@ -1,49 +0,0 @@
package sudoku.structure;
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
//TODO: doc
public class StateManager {
private final Stack<Map<Cell, Integer>> states;
private final MultiDoku doku;
public StateManager(MultiDoku doku) {
this.states = new Stack<>();
this.doku = doku;
}
public Map<Cell, Integer> pushState() {
states.add(saveState());
return states.getLast();
}
public void popState() {
assert (states.size() > 0);
restoreState(states.pop());
}
public Map<Cell, Integer> popAndGetState() {
assert (states.size() > 0);
var currentState = saveState();
restoreState(states.pop());
return currentState;
}
private void restoreState(Map<Cell, Integer> state) {
for (var entry : state.entrySet()) {
entry.getKey().setSymbolIndex(entry.getValue());
}
}
private Map<Cell, Integer> saveState() {
Map<Cell, Integer> state = new HashMap<>();
for (Cell cell : this.doku.getCells()) {
state.put(cell, cell.getSymbolIndex());
}
return state;
}
}

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

@@ -1,14 +0,0 @@
/*
* 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");
}
}

9
app/src/test/java/sudoku/SudokuSerializerTest.java
View File

@@ -8,11 +8,10 @@ import java.util.Random;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
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.structure.MultiDoku;
import sudoku.structure.MultiDoku; import org.polytech.ryuk.sudoku.structure.SudokuFactory;
import sudoku.structure.SudokuFactory;
public class SudokuSerializerTest { public class SudokuSerializerTest {

29
app/src/test/java/sudoku/solver/SolverTest.java
View File

@@ -1,19 +1,19 @@
package sudoku.solver; 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 static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List; import java.util.List;
import java.util.Random; 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 { class SolverTest {
@Test @Test
@@ -39,8 +39,7 @@ class SolverTest {
assert (sudokuToTest.setImmutableCellsSymbol(immutableCells)); 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, List<Integer> correctCells = List.of(7, 6, 0, 3, 4, 2, 8, 5, 1,
2, 3, 8, 1, 5, 6, 7, 0, 4, 2, 3, 8, 1, 5, 6, 7, 0, 4,
@@ -55,15 +54,14 @@ class SolverTest {
sudokuResult.setCellsSymbol(correctCells); sudokuResult.setCellsSymbol(correctCells);
System.out.println("\n****************************Doku Control\n"); System.out.println("\n****************************Doku Control\n");
SudokuPrinter.printRectangleSudoku(sudokuResult, 3, 3, Symbols.Russian); SudokuPrinter.printRectangleSudoku(sudokuResult, 3, 3);
assert (dokuResult.isSolved()); assert (dokuResult.isSolved());
new RandomSolver().solve(dokuToTest); new RandomSolver().solve(dokuToTest);
System.out.println("\n****************************\nDoku solved"); 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()); assert (dokuToTest.isSolved());
@@ -100,7 +98,6 @@ class SolverTest {
new RandomSolver().solve(dokuToTest3); 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);
} }
} }