Skip to content

Fix AnalysePlay under-counting (issue #156): reuse solver context across cards #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzcgumn merged 3 commits into from
May 30, 2026
Merged

Fix AnalysePlay under-counting (issue #156): reuse solver context across cards #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdd13cf
Fix AnalysePlay under-counting by reusing the solver context (warm TT)
ThorvaldAagaard May 29, 2026
f0c608a
Merge branch 'develop' into fix/analyse-play-cold-tt
zzcgumn May 30, 2026
bb0cda7
Remove call to old no-op.
zzcgumn May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions library/src/play_analyser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ int STDCALL AnalysePlayBin(
SolvedPlay * solvedp,
[[maybe_unused]] int thrId)
{
// Create an owned context for this analysis and obtain its ThreadData.
// Create an owned context for this analysis. The same context (and its
// transposition table) is reused for the initial solve and every subsequent
// analyse_later_board call, so the hint-bounded incremental searches see a
// warm TT -- see the analogous calc_dd_table fix (commit 27030ba).
SolverContext outer_ctx;
auto thrp = outer_ctx.thread();

MoveType move;
FutureTricks fut;
Expand Down Expand Up @@ -196,7 +198,7 @@ int STDCALL AnalysePlayBin(
if (usingCurrent)
continue;

if ((ret = analyse_later_board(thrp, dl.first, &move, hint,
if ((ret = analyse_later_board(ctx, dl.first, &move, hint,
hintDir, &fut))
!= RETURN_NO_FAULT)
{
Expand Down
67 changes: 36 additions & 31 deletions library/src/solver_if.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ auto solve_same_board(


auto analyse_later_board(
const std::shared_ptr<ThreadData>& thrp,
SolverContext& ctx,
const int leadHand,
MoveType const * move,
const int hint,
Expand All @@ -818,62 +818,67 @@ auto analyse_later_board(
// target == -1, solutions == 1, mode == 2.
// The function only needs to return fut.score[0].

SolverContext ctxLater{thrp};
int ini_depth = --ctxLater.search().ini_depth();
// Reuse the caller's context (and its warm transposition table) instead of
// constructing a fresh one with a cold TT. The hint-bounded null-window
// search below relies on the TT state built up by the initial solve and the
// preceding cards; a cold TT yields wrong (under-counted) AnalysePlay
// results. This mirrors the calc_dd_table fix in commit 27030ba.
auto thrp = ctx.thread();
int ini_depth = --ctx.search().ini_depth();
int cardCount = ini_depth + 4;
int trick = (ini_depth + 3) >> 2;
int hand_rel_first = (48 - ini_depth) % 4;
{
ctxLater.search().trick_nodes() = 0;
ctx.search().trick_nodes() = 0;
}
{
ctxLater.search().analysis_flag() = true;
ctx.search().analysis_flag() = true;
}
int handToPlay = HAND_ID(leadHand, hand_rel_first);

{
if (handToPlay == 0 || handToPlay == 2)
{
ctxLater.search().node_type_store(0) = MAXNODE;
ctxLater.search().node_type_store(1) = MINNODE;
ctxLater.search().node_type_store(2) = MAXNODE;
ctxLater.search().node_type_store(3) = MINNODE;
ctx.search().node_type_store(0) = MAXNODE;
ctx.search().node_type_store(1) = MINNODE;
ctx.search().node_type_store(2) = MAXNODE;
ctx.search().node_type_store(3) = MINNODE;
}
else
{
ctxLater.search().node_type_store(0) = MINNODE;
ctxLater.search().node_type_store(1) = MAXNODE;
ctxLater.search().node_type_store(2) = MINNODE;
ctxLater.search().node_type_store(3) = MAXNODE;
ctx.search().node_type_store(0) = MINNODE;
ctx.search().node_type_store(1) = MAXNODE;
ctx.search().node_type_store(2) = MINNODE;
ctx.search().node_type_store(3) = MAXNODE;
}
}

if (hand_rel_first == 0)
{
ctxLater.move_gen().make_specific(* move, trick + 1, 3);
ctx.move_gen().make_specific(* move, trick + 1, 3);
unsigned short int ourWinRanks[DDS_SUITS]; // Unused here
make_3(&thrp->lookAheadPos, ourWinRanks, ini_depth + 1, move, ctxLater);
make_3(&thrp->lookAheadPos, ourWinRanks, ini_depth + 1, move, ctx);
}
else if (hand_rel_first == 1)
{
ctxLater.move_gen().make_specific(* move, trick, 0);
ctx.move_gen().make_specific(* move, trick, 0);
make_0(&thrp->lookAheadPos, ini_depth + 1, move);
}
else if (hand_rel_first == 2)
{
ctxLater.move_gen().make_specific(* move, trick, 1);
ctx.move_gen().make_specific(* move, trick, 1);
make_1(&thrp->lookAheadPos, ini_depth + 1, move);
}
else
{
ctxLater.move_gen().make_specific(* move, trick, 2);
ctx.move_gen().make_specific(* move, trick, 2);
make_2(&thrp->lookAheadPos, ini_depth + 1, move);
}

if (cardCount <= 4)
{
// Last trick.
EvalType eval = evaluate_with_context(&thrp->lookAheadPos, thrp->trump, ctxLater);
EvalType eval = evaluate_with_context(&thrp->lookAheadPos, thrp->trump, ctx);
futp->score[0] = eval.tricks;
futp->nodes = 0;

Expand All @@ -887,7 +892,7 @@ auto analyse_later_board(

#ifdef DDS_TOP_LEVEL
{
ctxLater.search().nodes() = 0;
ctx.search().nodes() = 0;
}
#endif

Expand All @@ -908,14 +913,14 @@ auto analyse_later_board(

do
{
ctxLater.reset_best_moves_lite();
ctx.reset_best_moves_lite();

TIMER_START(TIMER_NO_AB, ini_depth);
thrp->val = (* AB_ptr_trace_list[hand_rel_first])(
&thrp->lookAheadPos,
guess,
ini_depth,
ctxLater);
ctx);
TIMER_END(TIMER_NO_AB, ini_depth);

#ifdef DDS_TOP_LEVEL
Expand All @@ -933,11 +938,11 @@ auto analyse_later_board(

futp->score[0] = lowerbound;
{
futp->nodes = ctxLater.search().trick_nodes();
futp->nodes = ctx.search().trick_nodes();
}


thrp->memUsed = ctxLater.trans_table()->memory_in_use() +
thrp->memUsed = ctx.trans_table()->memory_in_use() +
ThreadMemoryUsed();

#ifdef DDS_TIMING
Expand All @@ -952,24 +957,24 @@ auto analyse_later_board(
// thrp->transTable->PrintAllEntryStats(thrp->fileTTstats.GetStream());

{
ctxLater.trans_table()->print_summary_suit_stats(thrp->fileTTstats.GetStream());
ctxLater.trans_table()->print_summary_entry_stats(thrp->fileTTstats.GetStream());
ctx.trans_table()->print_summary_suit_stats(thrp->fileTTstats.GetStream());
ctx.trans_table()->print_summary_entry_stats(thrp->fileTTstats.GetStream());
}

// These are for the small TT -- empty if not.
{
ctxLater.trans_table()->print_node_stats(thrp->fileTTstats.GetStream());
ctxLater.trans_table()->print_reset_stats(thrp->fileTTstats.GetStream());
ctx.trans_table()->print_node_stats(thrp->fileTTstats.GetStream());
ctx.trans_table()->print_reset_stats(thrp->fileTTstats.GetStream());
}
#endif

// Diagnostics are routed via the SolverContext MoveGen facade.
#ifdef DDS_MOVES
ctxLater.move_gen().print_trick_stats(thrp->fileMoves.GetStream());
ctx.move_gen().print_trick_stats(thrp->fileMoves.GetStream());
#ifdef DDS_MOVES_DETAILS
ctxLater.move_gen().print_trick_details(thrp->fileMoves.GetStream());
ctx.move_gen().print_trick_details(thrp->fileMoves.GetStream());
#endif
ctxLater.move_gen().print_function_stats(thrp->fileMoves.GetStream());
ctx.move_gen().print_function_stats(thrp->fileMoves.GetStream());
#endif

#ifdef DDS_MEMORY_LEAKS_WIN32
Expand Down
2 changes: 1 addition & 1 deletion library/src/solver_if.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ auto solve_same_board(
const int hint) -> int;

auto analyse_later_board(
const std::shared_ptr<ThreadData>& thrp,
SolverContext& ctx,
const int leadHand,
MoveType const * move,
const int hint,
Expand Down
12 changes: 12 additions & 0 deletions library/tests/solve_board/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@ cc_test(
"@googletest//:gtest_main",
],
)

cc_test(
name = "analyse_play_consistency_test",
size = "small",
srcs = [
"analyse_play_consistency.cpp",
],
deps = [
"//library/src:testable_dds",
"@googletest//:gtest_main",
],
)
Loading
Loading