Skip to content

Deduplicate identical deals in CalcAllTablesN #215

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

Draft
tameware wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Deduplicate identical deals in CalcAllTablesN #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 44 additions & 3 deletions library/src/calc_tables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,18 @@ int STDCALL CalcDDtable(
}


namespace
{
auto same_deal_cards(const DdTableDeal& a, const DdTableDeal& b) -> bool
{
for (int h = 0; h < DDS_HANDS; h++)
for (int s = 0; s < DDS_SUITS; s++)
if (a.cards[h][s] != b.cards[h][s])
return false;
return true;
}
}

int STDCALL CalcAllTablesN(
DdTableDeals const * dealsp,
int mode,
Expand Down Expand Up @@ -254,12 +266,40 @@ int STDCALL CalcAllTablesN(
if (count * dealsp->no_of_tables > MAXNOOFTABLES * DDS_STRAINS)
return RETURN_TOO_MANY_TABLES;

// Deduplicate identical deals: solve each distinct deal once and map every
// copy back to the canonical solve. Identical deals always produce identical
// double-dummy tables, so this is exact. Mirrors v2.9's crossref behaviour and
// avoids re-solving repeated deals in a batch.
std::vector<int> deal_to_unique(static_cast<unsigned>(dealsp->no_of_tables));
std::vector<int> unique_deals;
Comment on lines 266 to +274
for (int m = 0; m < dealsp->no_of_tables; m++)
{
int found = -1;
for (unsigned u = 0; u < unique_deals.size(); u++)
{
if (same_deal_cards(dealsp->deals[unique_deals[u]], dealsp->deals[m]))
{
found = static_cast<int>(u);
break;
}
}
if (found < 0)
{
deal_to_unique[static_cast<unsigned>(m)] =
static_cast<int>(unique_deals.size());
unique_deals.push_back(m);
}
else
deal_to_unique[static_cast<unsigned>(m)] = found;
}
Comment on lines +269 to +294

@tameware tameware Jun 28, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initial benchmarking shows this change may do more harm than good. On the back-burner for now.


int ind = 0;
int lastIndex = 0;
resp->no_of_boards = 0;

for (int m = 0; m < dealsp->no_of_tables; m++)
for (unsigned u = 0; u < unique_deals.size(); u++)
{
const int m = unique_deals[u];
for (int tr = DDS_STRAINS-1; tr >= 0; tr--)
{
if (trumpFilter[tr])
Expand Down Expand Up @@ -292,13 +332,14 @@ int STDCALL CalcAllTablesN(
if (res != 1)
return res;

resp->no_of_boards += 4 * solved.no_of_boards;
resp->no_of_boards += 4 * dealsp->no_of_tables * count;

for (int m = 0; m < dealsp->no_of_tables; m++)
{
const int u = deal_to_unique[static_cast<unsigned>(m)];
for (int strainIndex = 0; strainIndex < count; strainIndex++)
{
int index = m * count + strainIndex;
int index = u * count + strainIndex;
int strain = bo.deals[index].trump;

// SH: I'm making a terrible use of the fut structure here.
Expand Down
Loading