mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 00:33:09 +00:00

Simplify away killer stage to a constant bonus given to the killer move during quiet move scoring. Passed Non-regression STC (Against then-pending PR #5472): LLR: 2.93 (-2.94,2.94) <-1.75,0.25> Total: 106176 W: 27685 L: 27539 D: 50952 Ptnml(0-2): 410, 12765, 26637, 12821, 455 https://tests.stockfishchess.org/tests/view/668dd0835034141ae5999e8f Passed Non-regression LTC: LLR: 2.95 (-2.94,2.94) <-1.75,0.25> Total: 92472 W: 23426 L: 23276 D: 45770 Ptnml(0-2): 55, 10376, 25215, 10544, 46 https://tests.stockfishchess.org/tests/view/669019e45034141ae5999fd2 closes https://github.com/official-stockfish/Stockfish/pull/5476 Bench 1459677
197 lines
7 KiB
C++
197 lines
7 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2024 The Stockfish developers (see AUTHORS file)
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MOVEPICK_H_INCLUDED
|
|
#define MOVEPICK_H_INCLUDED
|
|
|
|
#include <algorithm>
|
|
#include <array>
|
|
#include <cassert>
|
|
#include <cmath>
|
|
#include <cstdint>
|
|
#include <cstdlib>
|
|
#include <limits>
|
|
#include <type_traits> // IWYU pragma: keep
|
|
|
|
#include "movegen.h"
|
|
#include "position.h"
|
|
#include "types.h"
|
|
|
|
namespace Stockfish {
|
|
|
|
constexpr int PAWN_HISTORY_SIZE = 512; // has to be a power of 2
|
|
constexpr int CORRECTION_HISTORY_SIZE = 16384; // has to be a power of 2
|
|
constexpr int CORRECTION_HISTORY_LIMIT = 1024;
|
|
|
|
static_assert((PAWN_HISTORY_SIZE & (PAWN_HISTORY_SIZE - 1)) == 0,
|
|
"PAWN_HISTORY_SIZE has to be a power of 2");
|
|
|
|
static_assert((CORRECTION_HISTORY_SIZE & (CORRECTION_HISTORY_SIZE - 1)) == 0,
|
|
"CORRECTION_HISTORY_SIZE has to be a power of 2");
|
|
|
|
enum PawnHistoryType {
|
|
Normal,
|
|
Correction
|
|
};
|
|
|
|
template<PawnHistoryType T = Normal>
|
|
inline int pawn_structure_index(const Position& pos) {
|
|
return pos.pawn_key() & ((T == Normal ? PAWN_HISTORY_SIZE : CORRECTION_HISTORY_SIZE) - 1);
|
|
}
|
|
|
|
// StatsEntry stores the stat table value. It is usually a number but could
|
|
// be a move or even a nested history. We use a class instead of a naked value
|
|
// to directly call history update operator<<() on the entry so to use stats
|
|
// tables at caller sites as simple multi-dim arrays.
|
|
template<typename T, int D>
|
|
class StatsEntry {
|
|
|
|
T entry;
|
|
|
|
public:
|
|
void operator=(const T& v) { entry = v; }
|
|
T* operator&() { return &entry; }
|
|
T* operator->() { return &entry; }
|
|
operator const T&() const { return entry; }
|
|
|
|
void operator<<(int bonus) {
|
|
static_assert(D <= std::numeric_limits<T>::max(), "D overflows T");
|
|
|
|
// Make sure that bonus is in range [-D, D]
|
|
int clampedBonus = std::clamp(bonus, -D, D);
|
|
entry += clampedBonus - entry * std::abs(clampedBonus) / D;
|
|
|
|
assert(std::abs(entry) <= D);
|
|
}
|
|
};
|
|
|
|
// Stats is a generic N-dimensional array used to store various statistics.
|
|
// The first template parameter T is the base type of the array, and the second
|
|
// template parameter D limits the range of updates in [-D, D] when we update
|
|
// values with the << operator, while the last parameters (Size and Sizes)
|
|
// encode the dimensions of the array.
|
|
template<typename T, int D, int Size, int... Sizes>
|
|
struct Stats: public std::array<Stats<T, D, Sizes...>, Size> {
|
|
using stats = Stats<T, D, Size, Sizes...>;
|
|
|
|
void fill(const T& v) {
|
|
|
|
// For standard-layout 'this' points to the first struct member
|
|
assert(std::is_standard_layout_v<stats>);
|
|
|
|
using entry = StatsEntry<T, D>;
|
|
entry* p = reinterpret_cast<entry*>(this);
|
|
std::fill(p, p + sizeof(*this) / sizeof(entry), v);
|
|
}
|
|
};
|
|
|
|
template<typename T, int D, int Size>
|
|
struct Stats<T, D, Size>: public std::array<StatsEntry<T, D>, Size> {};
|
|
|
|
// In stats table, D=0 means that the template parameter is not used
|
|
enum StatsParams {
|
|
NOT_USED = 0
|
|
};
|
|
enum StatsType {
|
|
NoCaptures,
|
|
Captures
|
|
};
|
|
|
|
// ButterflyHistory records how often quiet moves have been successful or unsuccessful
|
|
// during the current search, and is used for reduction and move ordering decisions.
|
|
// It uses 2 tables (one for each color) indexed by the move's from and to squares,
|
|
// see www.chessprogramming.org/Butterfly_Boards (~11 elo)
|
|
using ButterflyHistory = Stats<int16_t, 7183, COLOR_NB, int(SQUARE_NB) * int(SQUARE_NB)>;
|
|
|
|
// CapturePieceToHistory is addressed by a move's [piece][to][captured piece type]
|
|
using CapturePieceToHistory = Stats<int16_t, 10692, PIECE_NB, SQUARE_NB, PIECE_TYPE_NB>;
|
|
|
|
// PieceToHistory is like ButterflyHistory but is addressed by a move's [piece][to]
|
|
using PieceToHistory = Stats<int16_t, 29952, PIECE_NB, SQUARE_NB>;
|
|
|
|
// ContinuationHistory is the combined history of a given pair of moves, usually
|
|
// the current one given a previous one. The nested history table is based on
|
|
// PieceToHistory instead of ButterflyBoards.
|
|
// (~63 elo)
|
|
using ContinuationHistory = Stats<PieceToHistory, NOT_USED, PIECE_NB, SQUARE_NB>;
|
|
|
|
// PawnHistory is addressed by the pawn structure and a move's [piece][to]
|
|
using PawnHistory = Stats<int16_t, 8192, PAWN_HISTORY_SIZE, PIECE_NB, SQUARE_NB>;
|
|
|
|
// CorrectionHistory is addressed by color and pawn structure
|
|
using CorrectionHistory =
|
|
Stats<int16_t, CORRECTION_HISTORY_LIMIT, COLOR_NB, CORRECTION_HISTORY_SIZE>;
|
|
|
|
// MovePicker class is used to pick one pseudo-legal move at a time from the
|
|
// current position. The most important method is next_move(), which returns a
|
|
// new pseudo-legal move each time it is called, until there are no moves left,
|
|
// when Move::none() is returned. In order to improve the efficiency of the
|
|
// alpha-beta algorithm, MovePicker attempts to return the moves which are most
|
|
// likely to get a cut-off first.
|
|
class MovePicker {
|
|
|
|
enum PickType {
|
|
Next,
|
|
Best
|
|
};
|
|
|
|
public:
|
|
MovePicker(const MovePicker&) = delete;
|
|
MovePicker& operator=(const MovePicker&) = delete;
|
|
MovePicker(const Position&,
|
|
Move,
|
|
Depth,
|
|
const ButterflyHistory*,
|
|
const CapturePieceToHistory*,
|
|
const PieceToHistory**,
|
|
const PawnHistory*,
|
|
Move);
|
|
MovePicker(const Position&,
|
|
Move,
|
|
Depth,
|
|
const ButterflyHistory*,
|
|
const CapturePieceToHistory*,
|
|
const PieceToHistory**,
|
|
const PawnHistory*);
|
|
MovePicker(const Position&, Move, int, const CapturePieceToHistory*);
|
|
Move next_move(bool skipQuiets = false);
|
|
|
|
private:
|
|
template<PickType T, typename Pred>
|
|
Move select(Pred);
|
|
template<GenType>
|
|
void score();
|
|
ExtMove* begin() { return cur; }
|
|
ExtMove* end() { return endMoves; }
|
|
|
|
const Position& pos;
|
|
const ButterflyHistory* mainHistory;
|
|
const CapturePieceToHistory* captureHistory;
|
|
const PieceToHistory** continuationHistory;
|
|
const PawnHistory* pawnHistory;
|
|
Move ttMove, killer;
|
|
ExtMove * cur, *endMoves, *endBadCaptures, *beginBadQuiets, *endBadQuiets;
|
|
int stage;
|
|
int threshold;
|
|
Depth depth;
|
|
ExtMove moves[MAX_MOVES];
|
|
};
|
|
|
|
} // namespace Stockfish
|
|
|
|
#endif // #ifndef MOVEPICK_H_INCLUDED
|