From 7416df8a17d3a8e03e8c150da30ca4465a2871f8 Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Tue, 11 Apr 2023 14:43:51 -0400
Subject: [PATCH] Limite la longueur d'un coup sous les 5 secondes

---
 .idea/workspace.xml                           | 27 +++++++++----------
 src/main/java/laboratoire4/Main.java          | 24 ++++++++++++++---
 .../strategies/DefenseStrategy.java           |  6 -----
 .../strategies/MiniMaxStrategy.java           | 11 ++++++++
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c42e22d..f51e524 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,22 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="41395b4b-3252-492c-a869-5f4dab107186" name="Changes" comment="Beaucoup de changements">
+    <list default="true" id="41395b4b-3252-492c-a869-5f4dab107186" name="Changes" comment="Gitignore">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/Client.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/IPawn.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/IPawn.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pawn.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pawn.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/PawnUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/PawnUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pushed.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pushed.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pusher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/pawns/Pusher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/AttackStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/AttackStrategy.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/DefenseStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/DefenseStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/ImmediateDefenseStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/ImmediateDefenseStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/MasterStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/MasterStrategy.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/StartingStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/RandomStrategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/Strategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/Strategy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/WinningStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/laboratoire4/strategies/WinningStrategy.java" afterDir="false" />
     </list>
     <list id="98b8a79f-2f53-42bf-96da-7af322697a0d" name="Changes by acastonguay" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -202,7 +191,14 @@
       <option name="project" value="LOCAL" />
       <updated>1681061194019</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Gitignore">
+      <created>1681237323963</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1681237323963</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -215,7 +211,8 @@
     <MESSAGE value="Fixes?" />
     <MESSAGE value="Plus d'heuristiques" />
     <MESSAGE value="Beaucoup de changements" />
-    <option name="LAST_COMMIT_MESSAGE" value="Beaucoup de changements" />
+    <MESSAGE value="Gitignore" />
+    <option name="LAST_COMMIT_MESSAGE" value="Gitignore" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/main/java/laboratoire4/Main.java b/src/main/java/laboratoire4/Main.java
index b27a322..73d1728 100644
--- a/src/main/java/laboratoire4/Main.java
+++ b/src/main/java/laboratoire4/Main.java
@@ -1,9 +1,27 @@
 package laboratoire4;
 
-import java.io.IOException;
+import java.util.Scanner;
 
 public class Main {
-    public static void main(String[] args) throws IOException {
-        new Client("localhost", 8888).listen();
+    public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+
+        while (true) {
+            try {
+                new Client("localhost", 8888).listen();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            System.out.print("Recommencer? (Y/n) ");
+
+            if (scanner.hasNextLine()) {
+                String nextLine = scanner.nextLine();
+
+                if (nextLine.equals("n")) {
+                    System.exit(0);
+                }
+            }
+        }
     }
 }
diff --git a/src/main/java/laboratoire4/strategies/DefenseStrategy.java b/src/main/java/laboratoire4/strategies/DefenseStrategy.java
index ddd656c..88d7e2e 100644
--- a/src/main/java/laboratoire4/strategies/DefenseStrategy.java
+++ b/src/main/java/laboratoire4/strategies/DefenseStrategy.java
@@ -33,12 +33,6 @@ public class DefenseStrategy extends MiniMaxStrategy {
         }
 
         return super.getNextMove(game);
-//        EvaluationResult result = super.getNextMove(game);
-//        if (Math.abs(result.getRow() - game.getPlayer().getHome()) > DEFENSE_DISTANCE_FROM_HOME) {
-//            return null;
-//        }
-//
-//        return result;
     }
 
     @Override
diff --git a/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java b/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java
index 7dfe213..fb40606 100644
--- a/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java
+++ b/src/main/java/laboratoire4/strategies/MiniMaxStrategy.java
@@ -13,8 +13,10 @@ import java.util.Collection;
 
 public abstract class MiniMaxStrategy implements Strategy {
     private static final int MAX_DEPTH = 6;
+    private static final long MAX_TIME_MS = 4500;   // Moins de 5 secondes, car le tour n'est pas complètement fini
 
     protected SimulatedGame game;
+    protected long startTimeMs;
 
     @Override
     public EvaluationResult getNextMove(Game game) {
@@ -26,6 +28,7 @@ public abstract class MiniMaxStrategy implements Strategy {
 
         EvaluationResult maxResult = null;
         int maxScore = Integer.MIN_VALUE;
+        startTimeMs = System.currentTimeMillis();
 
         for (Action<IPawn> action : getActions(true)) {
             int score = min(0, Integer.MIN_VALUE, Integer.MAX_VALUE);
@@ -44,6 +47,10 @@ public abstract class MiniMaxStrategy implements Strategy {
             return evaluate();
         }
 
+        if (System.currentTimeMillis() - startTimeMs > MAX_TIME_MS) {
+            return Integer.MIN_VALUE;
+        }
+
         int maxScore = Integer.MIN_VALUE;
 
         for (Action<IPawn> action : getActions(true)) {
@@ -71,6 +78,10 @@ public abstract class MiniMaxStrategy implements Strategy {
             return evaluate();
         }
 
+        if (System.currentTimeMillis() - startTimeMs > MAX_TIME_MS) {
+            return Integer.MAX_VALUE;
+        }
+
         int minScore = Integer.MAX_VALUE;
 
         for (Action<IPawn> action : getActions(false)) {