X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=aaff388f641c0d61f239a722bb11d9b2f2808bb6;hb=527d832a6de81c455cc8818e85c309fa1443f862;hp=66518ac76861fff4d34a41078e89fa690631100d;hpb=74f1efee263aadcceb1df716ebd87776b932238a;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 66518ac7..aaff388f 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,17 +1,14 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2020 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
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.
-<<<<<<< HEAD:src/movepick.h
-=======
-
->>>>>>> d3600c39a745179ed6b094b305d0645e83a1ee86:src/movepick.h
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
@@ -21,100 +18,144 @@
along with this program. If not, see .
*/
-
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-////
-//// Includes
-////
+#include
+#include
+#include
-#include "depth.h"
-#include "lock.h"
+#include "movegen.h"
#include "position.h"
+#include "types.h"
+/// 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 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
+class StatsEntry {
-////
-//// Types
-////
-
-/// MovePicker is a class which is used to pick one legal move at a time from
-/// the current position. It is initialized with a Position object and a few
-/// moves we have reason to believe are good. The most important method is
-/// MovePicker::pick_next_move(), which returns a new legal move each time it
-/// is called, until there are no legal 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 be strongest first.
-
-class MovePicker {
+ T entry;
public:
+ void operator=(const T& v) { entry = v; }
+ T* operator&() { return &entry; }
+ T* operator->() { return &entry; }
+ operator const T&() const { return entry; }
- enum MovegenPhase {
- PH_TT_MOVE, // Transposition table move
- PH_MATE_KILLER, // Mate killer from the current ply
- PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE valuse <= 0
- PH_KILLER_1, // Killer move 1 from the current ply (not used yet).
- PH_KILLER_2, // Killer move 2 from the current ply (not used yet).
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Checks in quiescence search
- PH_STOP
- };
-
- MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
- Move get_next_move();
- Move get_next_move(Lock &lock);
- int number_of_moves() const;
- int current_move_score() const;
- MovegenPhase current_move_type() const;
- Bitboard discovered_check_candidates() const;
-
- static void init_phase_table();
+ void operator<<(int bonus) {
+ assert(abs(bonus) <= D); // Ensure range is [-D, D]
+ static_assert(D <= std::numeric_limits::max(), "D overflows T");
-private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void score_qcaptures();
- Move pick_move_from_list();
- int find_best_index();
+ entry += bonus - entry * abs(bonus) / D;
- const Position& pos;
- Move ttMove, mateKiller, killer1, killer2;
- Bitboard pinned, dc;
- MoveStack moves[256], badCaptures[64];
- bool pvNode;
- Depth depth;
- int phaseIndex;
- int numOfMoves, numOfBadCaptures;
- int movesPicked, badCapturesPicked;
- bool finished;
+ assert(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, 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
+struct Stats : public std::array, Size>
+{
+ typedef Stats stats;
+
+ void fill(const T& v) {
+
+ // For standard-layout 'this' points to first struct member
+ assert(std::is_standard_layout::value);
+
+ typedef StatsEntry entry;
+ entry* p = reinterpret_cast(this);
+ std::fill(p, p + sizeof(*this) / sizeof(entry), v);
+ }
};
+template
+struct Stats : public std::array, 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
+typedef Stats ButterflyHistory;
-////
-//// Inline functions
-////
+/// At higher depths LowPlyHistory records successful quiet moves near the root and quiet
+/// moves which are/were in the PV (ttPv)
+/// It is cleared with each new search and filled during iterative deepening
+constexpr int MAX_LPH = 4;
+typedef Stats LowPlyHistory;
-/// MovePicker::number_of_moves() simply returns the numOfMoves member
-/// variable. It is intended to be used in positions where the side to move
-/// is in check, for detecting checkmates or situations where there is only
-/// a single reply to check.
+/// CounterMoveHistory stores counter moves indexed by [piece][to] of the previous
+/// move, see www.chessprogramming.org/Countermove_Heuristic
+typedef Stats CounterMoveHistory;
-inline int MovePicker::number_of_moves() const {
+/// CapturePieceToHistory is addressed by a move's [piece][to][captured piece type]
+typedef Stats CapturePieceToHistory;
- return numOfMoves;
-}
+/// PieceToHistory is like ButterflyHistory but is addressed by a move's [piece][to]
+typedef Stats PieceToHistory;
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
+/// 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.
+typedef Stats ContinuationHistory;
-inline Bitboard MovePicker::discovered_check_candidates() const {
- return dc;
-}
-#endif // !defined(MOVEPICK_H_INCLUDED)
+/// 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, Value, const CapturePieceToHistory*);
+ MovePicker(const Position&, Move, Depth, const ButterflyHistory*,
+ const CapturePieceToHistory*,
+ const PieceToHistory**,
+ Square);
+ MovePicker(const Position&, Move, Depth, const ButterflyHistory*,
+ const LowPlyHistory*,
+ const CapturePieceToHistory*,
+ const PieceToHistory**,
+ Move,
+ const Move*,
+ int);
+ Move next_move(bool skipQuiets = false);
+
+private:
+ template Move select(Pred);
+ template void score();
+ ExtMove* begin() { return cur; }
+ ExtMove* end() { return endMoves; }
+
+ const Position& pos;
+ const ButterflyHistory* mainHistory;
+ const LowPlyHistory* lowPlyHistory;
+ const CapturePieceToHistory* captureHistory;
+ const PieceToHistory** continuationHistory;
+ Move ttMove;
+ ExtMove refutations[3], *cur, *endMoves, *endBadCaptures;
+ int stage;
+ Square recaptureSquare;
+ Value threshold;
+ Depth depth;
+ int ply;
+ ExtMove moves[MAX_MOVES];
+};
+
+#endif // #ifndef MOVEPICK_H_INCLUDED