mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 11:42:07 +00:00
Key the tablebase cache by position instead of full FEN (#28)
Add FEN.position_key/1 (board, side, castling and en-passant; clocks dropped) and have Tablebase.new/1 key cache reads and writes on it, so transpositions and clock-only differences share an entry. The Lichess category is a position property, so dropping the clocks is safe. Update the cache docs and tests, and give the play fixture's after_first/after_losing distinct positions since they previously differed only by the halfmove clock.
This commit is contained in:
@@ -12,6 +12,7 @@ defmodule Chesstrainer.Endgames.Tablebase do
|
||||
"""
|
||||
|
||||
alias Chesstrainer.Endgames.Tablebase
|
||||
alias Chesstrainer.FEN
|
||||
|
||||
@type result :: :win | :draw | :loss | :unknown
|
||||
|
||||
@@ -49,7 +50,9 @@ defmodule Chesstrainer.Endgames.Tablebase do
|
||||
| {:error, :invalid_endgame}
|
||||
| {:error, term()}
|
||||
def new(fen) do
|
||||
case Tablebase.Cache.get(fen) do
|
||||
key = FEN.position_key(fen)
|
||||
|
||||
case Tablebase.Cache.get(key) do
|
||||
{:ok, tablebase} ->
|
||||
{:ok, tablebase}
|
||||
|
||||
@@ -65,7 +68,7 @@ defmodule Chesstrainer.Endgames.Tablebase do
|
||||
{:error, :invalid_endgame}
|
||||
|
||||
{:ok, tablebase} ->
|
||||
Tablebase.Cache.put(fen, tablebase)
|
||||
Tablebase.Cache.put(key, tablebase)
|
||||
{:ok, tablebase}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
defmodule Chesstrainer.Endgames.Tablebase.Cache do
|
||||
@moduledoc """
|
||||
A cache of tablebases by FEN.
|
||||
A cache of tablebases keyed by position.
|
||||
|
||||
The key is a FEN's position fields (see `Chesstrainer.FEN.position_key/1`), so
|
||||
transpositions and clock-only differences share an entry.
|
||||
"""
|
||||
|
||||
alias Chesstrainer.Cache
|
||||
|
||||
@table :tablebase
|
||||
|
||||
def put(fen, tablebase), do: Cache.put(@table, fen, tablebase)
|
||||
def put(key, tablebase), do: Cache.put(@table, key, tablebase)
|
||||
|
||||
def get(fen), do: Cache.get(@table, fen)
|
||||
def get(key), do: Cache.get(@table, key)
|
||||
|
||||
def delete(fen), do: Cache.delete(@table, fen)
|
||||
def delete(key), do: Cache.delete(@table, key)
|
||||
def show, do: Cache.show(@table)
|
||||
def size, do: Cache.size(@table)
|
||||
end
|
||||
|
||||
@@ -40,6 +40,32 @@ defmodule Chesstrainer.FEN do
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns the position key for a FEN: the board, side to move, castling and
|
||||
en-passant fields, with the halfmove and fullmove clocks dropped.
|
||||
|
||||
A tablebase answer depends only on the position, so two FENs that differ only
|
||||
in their clocks resolve to the same position key and share a cache entry.
|
||||
|
||||
## Examples
|
||||
|
||||
iex> Chesstrainer.FEN.position_key("8/8/3k4/8/8/3K1R2/8/8 w - - 0 1")
|
||||
"8/8/3k4/8/8/3K1R2/8/8 w - -"
|
||||
|
||||
iex> Chesstrainer.FEN.position_key("8/8/3k4/8/8/3K1R2/8/8 w - - 37 99")
|
||||
"8/8/3k4/8/8/3K1R2/8/8 w - -"
|
||||
"""
|
||||
@spec position_key(String.t()) :: String.t()
|
||||
def position_key(fen) when is_binary(fen) do
|
||||
case String.split(fen) do
|
||||
[board, active, castling, en_passant | _] ->
|
||||
Enum.join([board, active, castling, en_passant], " ")
|
||||
|
||||
_ ->
|
||||
String.trim(fen)
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Counts the pieces on the board, or returns `nil` if the board field is not a
|
||||
well-formed FEN board.
|
||||
|
||||
Reference in New Issue
Block a user