Fix %eval sometimes off by one centipawn

niklasf · Dec 26, 2022 · cc079b6 · cc079b6
1 parent b04275a
commit cc079b6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/chess/engine.py b/chess/engine.py
@@ -1538,16 +1538,16 @@ def _go(self, limit: Limit, *, root_moves: Optional[Iterable[chess.Move]] = None
             builder.append("ponder")
         if limit.white_clock is not None:
             builder.append("wtime")
-            builder.append(str(max(1, int(limit.white_clock * 1000))))
+            builder.append(str(max(1, round(limit.white_clock * 1000))))
         if limit.black_clock is not None:
             builder.append("btime")
-            builder.append(str(max(1, int(limit.black_clock * 1000))))
+            builder.append(str(max(1, round(limit.black_clock * 1000))))
         if limit.white_inc is not None:
             builder.append("winc")
-            builder.append(str(int(limit.white_inc * 1000)))
+            builder.append(str(round(limit.white_inc * 1000)))
         if limit.black_inc is not None:
             builder.append("binc")
-            builder.append(str(int(limit.black_inc * 1000)))
+            builder.append(str(round(limit.black_inc * 1000)))
         if limit.remaining_moves is not None and int(limit.remaining_moves) > 0:
             builder.append("movestogo")
             builder.append(str(int(limit.remaining_moves)))
@@ -1562,7 +1562,7 @@ def _go(self, limit: Limit, *, root_moves: Optional[Iterable[chess.Move]] = None
             builder.append(str(max(1, int(limit.mate))))
         if limit.time is not None:
             builder.append("movetime")
-            builder.append(str(max(1, int(limit.time * 1000))))
+            builder.append(str(max(1, round(limit.time * 1000))))
         if infinite:
             builder.append("infinite")
         if root_moves is not None:
@@ -2160,9 +2160,9 @@ def start(self, engine: XBoardProtocol) -> None:
                 if limit.depth is not None:
                     engine.send_line(f"sd {max(1, int(limit.depth))}")
                 if limit.white_clock is not None:
-                    engine.send_line("{} {}".format("time" if board.turn else "otim", max(1, int(limit.white_clock * 100))))
+                    engine.send_line("{} {}".format("time" if board.turn else "otim", max(1, round(limit.white_clock * 100))))
                 if limit.black_clock is not None:
-                    engine.send_line("{} {}".format("otim" if board.turn else "time", max(1, int(limit.black_clock * 100))))
+                    engine.send_line("{} {}".format("otim" if board.turn else "time", max(1, round(limit.black_clock * 100))))
 
                 if draw_offered and engine.features.get("draw", 1):
                     engine.send_line("draw")

diff --git a/chess/pgn.py b/chess/pgn.py
@@ -420,7 +420,7 @@ def eval(self) -> Optional[chess.engine.PovScore]:
                 # who has been mated.
                 return chess.engine.PovScore(score, turn)
         else:
-            score = chess.engine.Cp(int(float(match.group("cp")) * 100))
+            score = chess.engine.Cp(round(float(match.group("cp")) * 100))
 
         return chess.engine.PovScore(score if turn else -score, turn)
 

diff --git a/test.py b/test.py
@@ -2806,6 +2806,12 @@ def test_annotations(self):
         game.set_arrows([])
         self.assertEqual(game.comment, "foo [%bar] baz")
 
+    def test_eval(self):
+        game = chess.pgn.Game()
+        for cp in range(199, 220):
+            game.set_eval(chess.engine.PovScore(chess.engine.Cp(cp), chess.WHITE))
+            self.assertEqual(game.eval().white().cp, cp)
+
     def test_float_emt(self):
         game = chess.pgn.Game()
         game.comment = "[%emt 0:00:01.234]"