Skip to content

Add semicolon missing from PR 223 (two-percent-solution) #224

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

Open
Copilot wants to merge 2 commits into
base: develop
Choose a base branch
from
+25 −34
Open

Add semicolon missing from PR 223 (two-percent-solution) #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef4626
Initial plan
Copilot Jul 3, 2026
ee533f1
Fix ASAN CI: add missing semicolon and remove redundant casts
Copilot Jul 3, 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
16 changes: 8 additions & 8 deletions library/src/ab_search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,10 +878,10 @@ void make_3(

int aggr = posPoint->aggr[st];

posPoint->winner[st].rank = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[1][st].rank);
posPoint->winner[st].hand = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[1][st].hand);
posPoint->second_best[st].rank = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[2][st].rank);
posPoint->second_best[st].hand = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[2][st].hand);
posPoint->winner[st].rank = thrp->rel[aggr].abs_rank[1][st].rank;
posPoint->winner[st].hand = thrp->rel[aggr].abs_rank[1][st].hand;
posPoint->second_best[st].rank = thrp->rel[aggr].abs_rank[2][st].rank;
posPoint->second_best[st].hand = thrp->rel[aggr].abs_rank[2][st].hand;

}
}
Expand Down Expand Up @@ -944,10 +944,10 @@ static void make_3_ctx(

int aggr = posPoint->aggr[st];

posPoint->winner[st].rank = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[1][st].rank);
posPoint->winner[st].hand = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[1][st].hand);
posPoint->second_best[st].rank = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[2][st].rank);
posPoint->second_best[st].hand = static_cast<unsigned char>(thrp->rel[aggr].abs_rank[2][st].hand);
posPoint->winner[st].rank = thrp->rel[aggr].abs_rank[1][st].rank;
posPoint->winner[st].hand = thrp->rel[aggr].abs_rank[1][st].hand;
posPoint->second_best[st].rank = thrp->rel[aggr].abs_rank[2][st].rank;
posPoint->second_best[st].hand = thrp->rel[aggr].abs_rank[2][st].hand;

}
}
Expand Down
39 changes: 15 additions & 24 deletions library/src/heuristic_sorting/heuristic_sorting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ void weight_alloc_trump_void1(HeuristicContext& ctx)

const int partner_lh = partner[lead_hand];
const int rho_lh = rho[lead_hand];

unsigned short suitCount = tpos.length[curr_hand][suit];
int suitAdd;

Expand Down Expand Up @@ -702,10 +702,10 @@ void weight_alloc_trump_void1(HeuristicContext& ctx)
if (tpos.length[partner_lh][lead_suit] != 0)
{
// 3rd hand will follow.
if (tpos.rank_in_suit[rho_lh][lead_suit] >
(tpos.rank_in_suit[partner_lh][lead_suit] |
bit_map_rank[ctx.lead0_rank]))
// Partner has winning card.
if (tpos.rank_in_suit[rho_lh][lead_suit] >
(tpos.rank_in_suit[partner_lh][lead_suit] |
bit_map_rank[ctx.lead0_rank]))
// RHO can win.
suitAdd = 60 + (suitCount << 6) / 44;
else if ((tpos.length[rho_lh][lead_suit] == 0)
&& (tpos.length[rho_lh][trump] != 0))
Expand All @@ -726,9 +726,9 @@ void weight_alloc_trump_void1(HeuristicContext& ctx)
tpos.rank_in_suit[partner_lh][trump]))
// Partner can overruff 3rd hand.
suitAdd = 60 + (suitCount << 6) / 44;
else if ((tpos.length[partner_lh][trump] == 0)
&& (tpos.rank_in_suit[rho_lh][lead_suit] >
bit_map_rank[ctx.lead0_rank]))
else if ((tpos.length[partner_lh][trump] == 0)
&& (tpos.rank_in_suit[rho_lh][lead_suit] >
bit_map_rank[ctx.lead0_rank]))
// 3rd hand has no trumps, and partner has suit winner.
suitAdd = 60 + (suitCount << 6) / 44;
else
Expand Down Expand Up @@ -1181,7 +1181,7 @@ void weight_alloc_trump_void2(HeuristicContext& ctx)
MoveType* mply = ctx.mply;

const int rho_lh = rho[lead_hand];

int suitAdd;
const unsigned short suitCount = tpos.length[curr_hand][suit];
const int max4th = highest_rank[tpos.rank_in_suit[rho_lh][lead_suit]];
Expand Down Expand Up @@ -1209,19 +1209,16 @@ void weight_alloc_trump_void2(HeuristicContext& ctx)

for (int k = last_num_moves; k < num_moves; k++)
{
if (ctx.move1_suit == trump &&
mply[k].rank < ctx.move1_rank)
if (ctx.move1_suit == trump &&
mply[k].rank < ctx.move1_rank)
{
// Don't underruff.
unsigned char aggrSuit = static_cast<unsigned char>(tpos.aggr[suit]);
unsigned char moveRank = static_cast<unsigned char>(mply[k].rank);
unsigned char relRankValue = static_cast<unsigned char>(rel_rank[aggrSuit][moveRank]);
int r_rank = static_cast<int>(relRankValue);
int r_rank = rel_rank[tpos.aggr[suit]][mply[k].rank];
suitAdd = (suitCount << 6) / 40;
mply[k].weight = -32 + r_rank + suitAdd;
}

else if (ctx.high1 == 0)
else if (ctx.high1 == 0)
{
// We ruff partner's winner over 2nd hand.
if (max4th != 0)
Expand Down Expand Up @@ -1386,10 +1383,7 @@ void weight_alloc_trump_void3(HeuristicContext& ctx)
{
for (int k = last_num_moves; k < num_moves; k++)
{
int r_rank = static_cast<int>(
static_cast<unsigned char>(
rel_rank[static_cast<unsigned char>(tpos.aggr[suit])]
[static_cast<unsigned char>(mply[k].rank)]));
int r_rank = rel_rank[tpos.aggr[suit]][mply[k].rank];
if (mply[k].rank > ctx.move2_rank)
mply[k].weight = 33 + r_rank; // Overruff
else
Expand All @@ -1404,10 +1398,7 @@ void weight_alloc_trump_void3(HeuristicContext& ctx)
{
for (int k = last_num_moves; k < num_moves; k++)
{
int r_rank = static_cast<int>(
static_cast<unsigned char>(
rel_rank[static_cast<unsigned char>(tpos.aggr[suit])]
[static_cast<unsigned char>(mply[k].rank)]));
int r_rank = rel_rank[tpos.aggr[suit]][mply[k].rank];
mply[k].weight = 33 + r_rank;
}
}
Expand Down
4 changes: 2 additions & 2 deletions library/src/quick_tricks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ int QuickTricksPartnerHandTrump(
if (ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].hand == partner[hand])
{
tpos.win_ranks[depth][suit] |= bit_map_rank[
static_cast<int>(static_cast<unsigned char>(ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].rank)) ];
static_cast<int>(ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].rank) ];

tpos.win_ranks[depth][commSuit] |= bit_map_rank[commRank];

Expand Down Expand Up @@ -1110,7 +1110,7 @@ int QuickTricksPartnerHandNT(
if (ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].hand == partner[hand])
{
tpos.win_ranks[depth][suit] |= bit_map_rank[
static_cast<int>(static_cast<unsigned char>(ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].rank)) ];
static_cast<int>(ctx.thread_ptr()->rel[ranks].abs_rank[3][suit].rank) ];
qt++;
if (qt >= cutoff)
return qt;
Expand Down
Loading