Merge with main

lynx-chess · Nov 27, 2024 · ea3d76c · ea3d76c
2 parents 3774814 + 127303e
commit ea3d76c
Showing 1 changed file with 58 additions and 4 deletions.
diff --git a/src/Lynx/TimeManager.cs b/src/Lynx/TimeManager.cs
@@ -40,7 +40,7 @@ public static SearchConstraints CalculateTimeManagement(Game game, GoCommand goC
                 const int minSearchTime = 50;
 
                 var movesDivisor = goCommand.MovesToGo == 0
-                    ? ExpectedMovesLeft(game.PositionHashHistoryLength()) * 3 / 2
+                    ? MovesDivisor(ExpectedMovesLeft(game.PositionHashHistoryLength()))
                     : goCommand.MovesToGo;
 
                 millisecondsLeft -= engineGuiCommunicationTimeOverhead;
@@ -83,13 +83,66 @@ public static SearchConstraints CalculateTimeManagement(Game game, GoCommand goC
         return new(hardLimitTimeBound, softLimitTimeBound, maxDepth);
     }
 
+    /// <summary>
+    /// Offset applied after <see cref="ExpectedMovesLeft(int)"/>
+    /// Moves 0 - 20: 64 64 63 63 61 61 60 60 58 58 57 57 55 55 54 54 52 52 52 51
+    /// Moves 19-29: 51 49 49 48 48 48 46 46 46 45 45 45 43 43 43 43 42 42 42 42
+    /// Moves 39-49: 40 40 40 40 40 40 39 39 39 39 39 39 39 37 37 37 37 37 37 37
+    /// Moves 59-69: 37 37 37 37 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
+    /// Moves 79-89: 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
+    /// Moves 99-109: 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
+    /// Moves 119-129: 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36 36
+    /// Moves 139-149: 36 36 36 36 36 36 36 36 36 36 36 36 36 37 37 37 37 37 37 37
+    /// Moves 159-169: 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+    /// Moves 179-189: 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+    /// Moves 199-209: 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 39
+    /// Moves 219-229: 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+    /// Moves 239-249: 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+    /// Moves 259-269: 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+    /// Moves 279-289: 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39
+    /// Moves 299-309: 39 39 39 39 39 39 39 39 39 39 39 39 39 39 39 40 40 40 40 40
+    /// Moves 319-329: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 339-349: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 359-369: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 379-389: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 399-409: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 419-429: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 439-449: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 459-469: 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40
+    /// Moves 479-489: 40 40 40 40 40 40 40 40 40 40 40 40 40 42 42 42 42 42 42 42
+    /// </summary>
+    /// <param name="expectedMovesLeft"></param>
+    /// <returns></returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int MovesDivisor(int expectedMovesLeft)
+    {
+        return expectedMovesLeft * 3 / 2;
+    }
+
     /// <summary>
     /// Straight from expositor's author paper, https://expositor.dev/pdf/movetime.pdf
+    /// 10 moves / 20 plies per row:
+    /// Moves 0 - 20:   43 43 42 42 41 41 40 40 39 39 38 38 37 37 36 36 35 35 35 34
+    /// Moves 19-29:    34 33 33 32 32 32 31 31 31 30 30 30 29 29 29 29 28 28 28 28
+    /// Moves 39-49:    27 27 27 27 27 27 26 26 26 26 26 26 26 25 25 25 25 25 25 25
+    /// Moves 59-69:    25 25 25 25 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+    /// Moves 79-89:    24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+    /// Moves 99-109:   24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+    /// Moves 119-129:  24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24 24
+    /// Moves 139-149:  24 24 24 24 24 24 24 24 24 24 24 24 24 25 25 25 25 25 25 25
+    /// Moves 159-169:  25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25
+    /// Moves 179-189:  25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25
+    /// Moves 199-209:  25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 25 26
+    /// Moves 219-229:  26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
+    /// Moves 239-249:  26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
+    /// Moves 259-269:  26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
+    /// Moves 279-289:  26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 26
+    /// Moves 299-309:  26 26 26 26 26 26 26 26 26 26 26 26 26 26 26 27 27 27 27 27
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static int ExpectedMovesLeft(int plies_played)
     {
-        double p = (double)(plies_played);
+        double p = plies_played;
 
         return (int)Math.Round(
             (59.3 + ((72830.0 - (p * 2330.0)) / ((p * p) + (p * 10.0) + 2644.0)))   // Plies remaining
@@ -108,8 +161,9 @@ public static int SoftLimit(SearchConstraints searchConstraints, ulong bestMoveN
         double scale = 1.0;
 
         // Node time management: scale soft limit time bound by the proportion of nodes spent
-        // searching the best move at root level vs the total nodes searched
-        // More time spent in best move -> less time for the rest of the search
+        //   searching the best move at root level vs the total nodes searched.
+        // The more time spent in best move -> the more sure we are about our previous results,
+        //   so the less time we spent in the search.
         // i.e. with nodeTmBase = 2 and nodeTmScale = 1
         // - bestMoveFraction = 0.50 -> scale = 1.0 x (2 - 0.5) = 1.5
         // - bestMoveFraction = 0.25 -> scale = 1.0 x (2 - 0.25) = 1.75