From ec657c3424e9511579b667fa1987004237905495 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 3 Nov 2026 12:41:28 +0100 Subject: [PATCH] Simplify the Tablebase struct to the fields the grader reads (#26) Drop dtm/dtc from Tablebase and Tablebase.Move; the local Syzygy backend cannot produce them and nothing reads them. The Lichess parser now maps only category, checkmate and moves (with per-move category, dtz, san and uci), and the struct-shape tests follow. --- lib/chesstrainer/endgames/tablebase.ex | 10 +++------- lib/chesstrainer/endgames/tablebase/move.ex | 10 +++------- lib/chesstrainer/endgames/tablebase/parser.ex | 4 ---- test/chesstrainer/endgames/tablebase_test.exs | 12 ++++++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/chesstrainer/endgames/tablebase.ex b/lib/chesstrainer/endgames/tablebase.ex index 2ad3a85..e055cec 100644 --- a/lib/chesstrainer/endgames/tablebase.ex +++ b/lib/chesstrainer/endgames/tablebase.ex @@ -3,9 +3,9 @@ defmodule Chesstrainer.Endgames.Tablebase do All endgame tablebase related functions. The cached value carries only what the trainer reads: `category`, - `checkmate`, and `moves` drive play, while `dtm`/`dtc` are small distance - hedges. Cursed-win/blessed-loss are normalised to `:draw` at parse time, so - the raw `dtw`/`dtz`/`insufficient_material` fields are not kept here. + `checkmate`, and `moves`. Cursed-win/blessed-loss are normalised to `:draw` at + parse time, and distance fields (`dtm`/`dtc`/`dtw`) are not kept because the + local Syzygy backend cannot produce them. """ alias Chesstrainer.Endgames.Tablebase @@ -15,15 +15,11 @@ defmodule Chesstrainer.Endgames.Tablebase do @type t :: %__MODULE__{ category: result, checkmate: boolean(), - dtc: integer() | nil, - dtm: integer() | nil, moves: [Tablebase.Move.t()] } defstruct category: nil, checkmate: false, - dtc: nil, - dtm: nil, moves: nil @doc """ diff --git a/lib/chesstrainer/endgames/tablebase/move.ex b/lib/chesstrainer/endgames/tablebase/move.ex index f0aabc2..163ce5f 100644 --- a/lib/chesstrainer/endgames/tablebase/move.ex +++ b/lib/chesstrainer/endgames/tablebase/move.ex @@ -3,25 +3,21 @@ defmodule Chesstrainer.Endgames.Tablebase.Move do Moves struct for the tablebase Carries only the fields the trainer reads: `category` and `dtz` for grading, - `san`/`uci` for display and matching, and `dtm`/`dtc` as small distance - hedges. Terminal detection is structural (the next position's `checkmate` or - its empty `moves`), so no per-move terminal flags are kept. + and `san`/`uci` for display and matching. Terminal detection is structural + (the next position's `checkmate` or its empty `moves`), so no per-move + terminal flags are kept. """ @type result :: :win | :draw | :loss | :unknown @type t :: %__MODULE__{ category: result, - dtc: integer() | nil, - dtm: integer() | nil, dtz: integer() | nil, san: String.t() | nil, uci: String.t() | nil } defstruct category: nil, - dtc: nil, - dtm: nil, dtz: nil, san: nil, uci: nil diff --git a/lib/chesstrainer/endgames/tablebase/parser.ex b/lib/chesstrainer/endgames/tablebase/parser.ex index 33211c8..fcace1a 100644 --- a/lib/chesstrainer/endgames/tablebase/parser.ex +++ b/lib/chesstrainer/endgames/tablebase/parser.ex @@ -43,8 +43,6 @@ defmodule Chesstrainer.Endgames.Tablebase.Parser do %Tablebase{ category: Tablebase.normalize_category(map["category"]), checkmate: map["checkmate"], - dtc: map["dtc"], - dtm: map["dtm"], moves: Enum.map(map["moves"], &moves_from_map/1) }} end @@ -52,8 +50,6 @@ defmodule Chesstrainer.Endgames.Tablebase.Parser do defp moves_from_map(map) do %Tablebase.Move{ category: Tablebase.normalize_category(map["category"]), - dtc: map["dtc"], - dtm: map["dtm"], dtz: map["dtz"], san: map["san"], uci: map["uci"] diff --git a/test/chesstrainer/endgames/tablebase_test.exs b/test/chesstrainer/endgames/tablebase_test.exs index bd63269..4ccaf0b 100644 --- a/test/chesstrainer/endgames/tablebase_test.exs +++ b/test/chesstrainer/endgames/tablebase_test.exs @@ -35,12 +35,12 @@ defmodule Chesstrainer.Endgames.TablebaseTest do describe "struct shape" do test "Tablebase carries only the fields the trainer reads" do assert %Tablebase{} |> Map.from_struct() |> Map.keys() |> Enum.sort() == - [:category, :checkmate, :dtc, :dtm, :moves] + [:category, :checkmate, :moves] end test "Tablebase.Move carries only the fields the trainer reads" do assert %Tablebase.Move{} |> Map.from_struct() |> Map.keys() |> Enum.sort() == - [:category, :dtc, :dtm, :dtz, :san, :uci] + [:category, :dtz, :san, :uci] end end @@ -65,9 +65,9 @@ defmodule Chesstrainer.Endgames.TablebaseTest do ] }) - assert %Tablebase{category: :draw, checkmate: false, dtc: nil, dtm: 20} = tablebase + assert %Tablebase{category: :draw, checkmate: false} = tablebase - assert [%Tablebase.Move{category: :draw, dtc: nil, dtm: -19, dtz: -2}] = tablebase.moves + assert [%Tablebase.Move{category: :draw, dtz: -2}] = tablebase.moves assert [%Tablebase.Move{san: "Kd7", uci: "e8d7"}] = tablebase.moves end @@ -103,12 +103,12 @@ defmodule Chesstrainer.Endgames.TablebaseTest do }) assert %Tablebase{} |> Map.from_struct() |> Map.keys() |> Enum.sort() == - [:category, :checkmate, :dtc, :dtm, :moves] + [:category, :checkmate, :moves] assert [move] = tablebase.moves assert move |> Map.from_struct() |> Map.keys() |> Enum.sort() == - [:category, :dtc, :dtm, :dtz, :san, :uci] + [:category, :dtz, :san, :uci] end test "keeps checkmate and empty moves, which drive terminal detection" do