Skip to content

History_second_order #6223

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

Closed
wants to merge 1 commit into from
Closed

History_second_order #6223

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/history.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ class StatsEntry {
void operator<<(int bonus) {
// Make sure that bonus is in range [-D, D]
int clampedBonus = std::clamp(bonus, -D, D);
entry += clampedBonus - entry * std::abs(clampedBonus) / D;
int squaredBonus = clampedBonus * clampedBonus;
int bonus_sign = (1-2*(bonus<=0));
entry += clampedBonus - (entry * std::abs(clampedBonus) + bonus_sign*squaredBonus/2)/ D + squaredBonus*entry/(2*D*D);

assert(std::abs(entry) <= D);
}
Expand Down
46 changes: 23 additions & 23 deletions src/search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int correction_value(const Worker& w, const Position& pos, const Stack* const ss
m.is_ok() ? (*(ss - 2)->continuationCorrectionHistory)[pos.piece_on(m.to_sq())][m.to_sq()]
: 0;

return 8867 * pcv + 8136 * micv + 10757 * (wnpcv + bnpcv) + 7232 * cntcv;
return 9162 * pcv + 7734 * micv + 10923 * (wnpcv + bnpcv) + 7560 * cntcv;
}

// Add correctionHistory value to raw staticEval and guarantee evaluation
Expand All @@ -99,18 +99,18 @@ void update_correction_history(const Position& pos,
const Move m = (ss - 1)->currentMove;
const Color us = pos.side_to_move();

static constexpr int nonPawnWeight = 165;
static constexpr int nonPawnWeight = 155;

workerThread.pawnCorrectionHistory[pawn_correction_history_index(pos)][us] << bonus;
workerThread.minorPieceCorrectionHistory[minor_piece_index(pos)][us] << bonus * 153 / 128;
workerThread.minorPieceCorrectionHistory[minor_piece_index(pos)][us] << bonus * 144 / 128;
workerThread.nonPawnCorrectionHistory[non_pawn_index<WHITE>(pos)][WHITE][us]
<< bonus * nonPawnWeight / 128;
workerThread.nonPawnCorrectionHistory[non_pawn_index<BLACK>(pos)][BLACK][us]
<< bonus * nonPawnWeight / 128;

if (m.is_ok())
(*(ss - 2)->continuationCorrectionHistory)[pos.piece_on(m.to_sq())][m.to_sq()]
<< bonus * 153 / 128;
<< bonus * 144 / 128;
}

// Add a small random component to draw evaluations to avoid 3-fold blindness
Expand Down Expand Up @@ -1403,31 +1403,31 @@ Value Search::Worker::search(
update_all_stats(pos, ss, *this, bestMove, prevSq, quietsSearched, capturesSearched, depth,
ttData.move);
if (!PvNode)
ttMoveHistory << (bestMove == ttData.move ? 811 : -848);
ttMoveHistory << (bestMove == ttData.move ? 737 : -886);
}

// Bonus for prior quiet countermove that caused the fail low
else if (!priorCapture && prevSq != SQ_NONE)
{
int bonusScale = -215;
bonusScale += std::min(-(ss - 1)->statScore / 103, 337);
bonusScale += std::min(64 * depth, 552);
bonusScale += 177 * ((ss - 1)->moveCount > 8);
bonusScale += 141 * (!ss->inCheck && bestValue <= ss->staticEval - 94);
bonusScale += 141 * (!(ss - 1)->inCheck && bestValue <= -(ss - 1)->staticEval - 76);
int bonusScale = -270;
bonusScale += std::min(-(ss - 1)->statScore / 104, 342);
bonusScale += std::min(61 * depth, 536);
bonusScale += 197 * ((ss - 1)->moveCount > 8);
bonusScale += 153 * (!ss->inCheck && bestValue <= ss->staticEval - 99);
bonusScale += 131 * (!(ss - 1)->inCheck && bestValue <= -(ss - 1)->staticEval - 76);

bonusScale = std::max(bonusScale, 0);

const int scaledBonus = std::min(155 * depth - 88, 1416) * bonusScale;
const int scaledBonus = std::min(139 * depth - 95, 1439) * bonusScale;

update_continuation_histories(ss - 1, pos.piece_on(prevSq), prevSq,
scaledBonus * 397 / 32768);
scaledBonus * 395 / 32768);

mainHistory[~us][((ss - 1)->currentMove).from_to()] << scaledBonus * 224 / 32768;
mainHistory[~us][((ss - 1)->currentMove).from_to()] << scaledBonus * 229 / 32768;

if (type_of(pos.piece_on(prevSq)) != PAWN && ((ss - 1)->currentMove).type_of() != PROMOTION)
pawnHistory[pawn_history_index(pos)][pos.piece_on(prevSq)][prevSq]
<< scaledBonus * 1127 / 32768;
<< scaledBonus * 1053 / 32768;
}

// Bonus for prior capture countermove that caused the fail low
Expand Down Expand Up @@ -1818,10 +1818,10 @@ void update_all_stats(const Position& pos,
Piece movedPiece = pos.moved_piece(bestMove);
PieceType capturedPiece;

int quietBonus = std::min(170 * depth - 87, 1598) + 332 * (bestMove == ttMove);
int quietMalus = std::min(743 * depth - 180, 2287) - 33 * quietsSearched.size();
int captureBonus = std::min(124 * depth - 62, 1245) + 336 * (bestMove == ttMove);
int captureMalus = std::min(708 * depth - 148, 2287) - 29 * capturesSearched.size();
int quietBonus = std::min(163 * depth - 99, 1610) + 340 * (bestMove == ttMove);
int quietMalus = std::min(702 * depth - 179, 2332) - 37 * quietsSearched.size();
int captureBonus = std::min(117 * depth - 58, 1316) + 330 * (bestMove == ttMove);
int captureMalus = std::min(690 * depth - 137, 2352) - 38 * capturesSearched.size();

if (!pos.capture_stage(bestMove))
{
Expand Down Expand Up @@ -1858,7 +1858,7 @@ void update_all_stats(const Position& pos,
// at ply -1, -2, -3, -4, and -6 with current move.
void update_continuation_histories(Stack* ss, Piece pc, Square to, int bonus) {
static constexpr std::array<ConthistBonus, 6> conthist_bonuses = {
{{1, 1108}, {2, 652}, {3, 273}, {4, 572}, {5, 126}, {6, 449}}};
{{1, 1068}, {2, 668}, {3, 316}, {4, 551}, {5, 210}, {6, 384}}};

for (const auto [i, weight] : conthist_bonuses)
{
Expand All @@ -1879,14 +1879,14 @@ void update_quiet_histories(
workerThread.mainHistory[us][move.from_to()] << bonus; // Untuned to prevent duplicate effort

if (ss->ply < LOW_PLY_HISTORY_SIZE)
workerThread.lowPlyHistory[ss->ply][move.from_to()] << (bonus * 771 / 1024) + 40;
workerThread.lowPlyHistory[ss->ply][move.from_to()] << (bonus * 853 / 1024) + 40;

update_continuation_histories(ss, pos.moved_piece(move), move.to_sq(),
bonus * (bonus > 0 ? 979 : 842) / 1024);
bonus * 910 / 1024);

int pIndex = pawn_history_index(pos);
workerThread.pawnHistory[pIndex][pos.moved_piece(move)][move.to_sq()]
<< (bonus * (bonus > 0 ? 704 : 439) / 1024) + 70;
<< (bonus * (bonus > 0 ? 701 : 364) / 1024) + 70;
}

}
Expand Down
Loading