ajout d'une fenetre arene et bug divinebot

This commit is contained in:
felix-vi
2026-02-05 19:46:02 +01:00
parent ee374a9221
commit 43e44bf7d2
2 changed files with 95 additions and 51 deletions

View File

@@ -208,8 +208,25 @@ public class ArenaWindow extends JFrame {
// Charger le plateau initial // Charger le plateau initial
Tower[][] initialGrid = BoardLoader.loadFromFile("fr/iut_fbleau/Res/Plateau.txt"); Tower[][] initialGrid = BoardLoader.loadFromFile("fr/iut_fbleau/Res/Plateau.txt");
// Lancer les parties // Créer un dialogue de progression
JDialog progressDialog = new JDialog(this, "Parties en cours...", true);
JLabel progressLabel = new JLabel("Préparation des parties...", JLabel.CENTER);
progressLabel.setBorder(BorderFactory.createEmptyBorder(20, 40, 20, 40));
progressDialog.add(progressLabel);
progressDialog.setSize(300, 100);
progressDialog.setLocationRelativeTo(this);
progressDialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
// Exécuter les parties dans un thread séparé pour ne pas bloquer l'interface
Thread arenaThread = new Thread(() -> {
SwingUtilities.invokeLater(() -> progressDialog.setVisible(true));
for (int i = 1; i <= nbParties; i++) { for (int i = 1; i <= nbParties; i++) {
final int partieNum = i;
SwingUtilities.invokeLater(() -> {
progressLabel.setText("Partie " + partieNum + " / " + nbParties + " en cours...");
});
AvalamBoard board = new AvalamBoard(initialGrid, Player.PLAYER1); AvalamBoard board = new AvalamBoard(initialGrid, Player.PLAYER1);
ArenaGame game = new ArenaGame(board, bot1, bot2); ArenaGame game = new ArenaGame(board, bot1, bot2);
@@ -217,24 +234,31 @@ public class ArenaWindow extends JFrame {
Result result = game.run(); Result result = game.run();
String winner = getWinnerName(result, bot1Type, bot2Type); String winner = getWinnerName(result, bot1Type, bot2Type);
// Ajouter au tableau // Ajouter au tableau dans le thread EDT
SwingUtilities.invokeLater(() -> {
tableModel.addRow(new Object[]{ tableModel.addRow(new Object[]{
"Partie " + i, "Partie " + partieNum,
bot1Type, bot1Type,
bot2Type, bot2Type,
winner winner
}); });
});
} catch (Exception e) { } catch (Exception e) {
SwingUtilities.invokeLater(() -> {
tableModel.addRow(new Object[]{ tableModel.addRow(new Object[]{
"Partie " + i, "Partie " + partieNum,
bot1Type, bot1Type,
bot2Type, bot2Type,
"Erreur: " + e.getMessage() "Erreur: " + e.getMessage()
}); });
});
} }
} }
// Afficher un message de fin avec possibilité de quitter directement // Fermer le dialogue et afficher le message de fin
SwingUtilities.invokeLater(() -> {
progressDialog.dispose();
Object[] options = {"OK", "Quitter le jeu"}; Object[] options = {"OK", "Quitter le jeu"};
int choice = JOptionPane.showOptionDialog( int choice = JOptionPane.showOptionDialog(
this, this,
@@ -250,6 +274,10 @@ public class ArenaWindow extends JFrame {
if (choice == 1) { if (choice == 1) {
System.exit(0); System.exit(0);
} }
});
});
arenaThread.start();
} }
/** /**

View File

@@ -105,22 +105,38 @@ public class DivineBot extends AbstractGamePlayer {
boolean isMax = board.getCurrentPlayer() == me; boolean isMax = board.getCurrentPlayer() == me;
for (AbstractPly m : listMoves(board)) { List<AbstractPly> moves = listMoves(board);
if (moves.isEmpty()) {
return evaluate(board);
}
if (isMax) {
int best = Integer.MIN_VALUE;
for (AbstractPly m : moves) {
IBoard next = board.safeCopy(); IBoard next = board.safeCopy();
next.doPly(m); next.doPly(m);
int val = alphaBeta(next, depth - 1, alpha, beta); int val = alphaBeta(next, depth - 1, alpha, beta);
best = Math.max(best, val);
alpha = Math.max(alpha, best);
if (isMax) {
alpha = Math.max(alpha, val);
if (alpha >= beta) break; // Coupure Beta if (alpha >= beta) break; // Coupure Beta
}
return best;
} else { } else {
beta = Math.min(beta, val); int best = Integer.MAX_VALUE;
for (AbstractPly m : moves) {
IBoard next = board.safeCopy();
next.doPly(m);
int val = alphaBeta(next, depth - 1, alpha, beta);
best = Math.min(best, val);
beta = Math.min(beta, best);
if (alpha >= beta) break; // Coupure Alpha if (alpha >= beta) break; // Coupure Alpha
} }
return best;
} }
return isMax ? alpha : beta;
} }
/** /**