lithander
diff --git a/‎MinimalChessBoard/Program.cs‎
Lines changed: 21 additions & 12 deletions b/‎MinimalChessBoard/Program.cs‎
Lines changed: 21 additions & 12 deletions
@@ -76,11 +76,10 @@ static void Main()
                         Console.WriteLine($"{board.SideToMove} >> {move}");
                         board.Play(move);
                     }
-                    else if (command == "?" && tokens.Length > 2)
+                    else if (command == "?" && tokens.Length == 3)
                     {
-                        int depth = int.Parse(tokens[1]);
-                        int num = (tokens.Length > 3) ? int.Parse(tokens[3]) : int.MaxValue;
-                        CompareBestMove(depth, tokens[2], num);
+                        int timeBudgetMs = int.Parse(tokens[2]);
+                        CompareBestMove(tokens[1], timeBudgetMs);
                     }
                     else if (command == "?")
                     {
@@ -209,14 +208,14 @@ private static long Perft(Board board, int depth)
                 return 1;
 
             //probe hash-tree
-            if (PerftTable.Retrieve(board.ZobristHash, depth, out long childCount))
-                return childCount;
+            //if (PerftTable.Retrieve(board.ZobristHash, depth, out long childCount))
+            //    return childCount;
 
             long sum = 0;
             foreach (var move in new LegalMoves(board))
                 sum += Perft(new Board(board, move), depth - 1);
 
-            PerftTable.Store(board.ZobristHash, depth, sum);
+            //PerftTable.Store(board.ZobristHash, depth, sum);
             return sum;
         }
 
@@ -287,7 +286,7 @@ private static void ComparePerft(int depth, string filePath)
         }
 
 
-        private static void CompareBestMove(int depth, string filePath, int maxCount)
+        private static void CompareBestMove(string filePath, int timeBudgetMs)
         {
             var file = File.OpenText(filePath);
             double freq = Stopwatch.Frequency;
@@ -296,26 +295,36 @@ private static void CompareBestMove(int depth, string filePath, int maxCount)
             int count = 0;
             int foundBest = 0;
             List<Move> bestMoves = new List<Move>();
-            while (!file.EndOfStream && count < maxCount)
+            while (!file.EndOfStream)
             {
                 ParseEpd(file.ReadLine(), out Board board, ref bestMoves);
                 Transpositions.Clear();
+                IterativeSearch search = new IterativeSearch(board);
+                Move pvMove = default;
                 long t0 = Stopwatch.GetTimestamp();
-                IterativeSearch search = new IterativeSearch(depth, board);
+                long tStop = t0 + (timeBudgetMs * Stopwatch.Frequency) / 1000;
+                //search until running out of time
+                while (true)
+                {
+                    search.SearchDeeper(() => Stopwatch.GetTimestamp() > tStop);
+                    if (search.Aborted)
+                        break;
+                    pvMove = search.PrincipalVariation[0];
+                }
                 long t1 = Stopwatch.GetTimestamp();
                 long dt = t1 - t0;
                 totalTime += dt;
                 totalNodes += search.NodesVisited;
                 count++;
                 string pvString = string.Join(' ', search.PrincipalVariation);
-                bool foundBestMove = bestMoves.Contains(search.PrincipalVariation[0]);
+                bool foundBestMove = bestMoves.Contains(pvMove);
                 if (foundBestMove)
                     foundBest++;
                 Console.WriteLine($"{count,4}. {(foundBestMove ? "[X]" : "[ ]")} {pvString} = {search.Score:+0.00;-0.00}, {search.NodesVisited / 1000}K nodes, { 1000 * dt / freq}ms");
                 Console.WriteLine($"{totalNodes,14} nodes, { (int)(totalTime / freq)} seconds, {foundBest} solved.");
             }
             Console.WriteLine();
-            Console.WriteLine($"Searched {count} positions to depth {depth}. {totalNodes/1000}K nodes visited. Took {totalTime/freq:0.###} seconds!");
+            Console.WriteLine($"Searched {count} positions for {timeBudgetMs}ms each. {totalNodes/1000}K nodes visited. Took {totalTime/freq:0.###} seconds!");
             Console.WriteLine($"Best move found in {foundBest} / {count} positions!");
         }