X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=db0ba3c465e4e8b5aacc832c6bff57955480ba9d;hp=37027ace23153d1dff36b88446df58d5b4be495d;hb=9c35b9365d75a3522cee47536419534b1de91f48;hpb=4ede49cd850392f28bc9da9537c111d2c3f0b297
diff --git a/src/movepick.h b/src/movepick.h
index 37027ace..db0ba3c4 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2017 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
@@ -17,59 +18,68 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include // For std::max
-#include // For std::memset
+#include
#include "movegen.h"
#include "position.h"
-#include "search.h"
#include "types.h"
+/// StatBoards is a generic 2-dimensional array used to store various statistics
+template
+struct StatBoards : public std::array, Size1> {
-/// The Stats struct stores moves statistics. According to the template parameter
-/// the class can store History, Gains and Countermoves. History records how often
-/// different moves have been successful or unsuccessful during the current search
-/// and is used for reduction and move ordering decisions. Gains records the move's
-/// best evaluation gain from one ply to the next and is used for pruning decisions.
-/// Countermoves store the move that refute a previous one. Entries are stored
-/// according only to moving piece and destination square, hence two moves with
-/// different origin but same destination and piece will be considered identical.
-template
-struct Stats {
-
- static const Value Max = Value(2000);
+ void fill(const T& v) {
+ T* p = &(*this)[0][0];
+ std::fill(p, p + sizeof(*this) / sizeof(*p), v);
+ }
- const T* operator[](Piece p) const { return table[p]; }
- void clear() { std::memset(table, 0, sizeof(table)); }
+ void update(T& entry, int bonus, const int D) {
- void update(Piece p, Square to, Move m) {
+ assert(abs(bonus) <= D); // Ensure range is [-32 * D, 32 * D]
+ assert(abs(32 * D) < INT16_MAX); // Ensure we don't overflow
- if (m == table[p][to].first)
- return;
+ entry += bonus * 32 - entry * abs(bonus) / D;
- table[p][to].second = table[p][to].first;
- table[p][to].first = m;
+ assert(abs(entry) <= 32 * D);
}
+};
+
+/// ButterflyBoards are 2 tables (one for each color) indexed by the move's from
+/// and to squares, see chessprogramming.wikispaces.com/Butterfly+Boards
+typedef StatBoards ButterflyBoards;
- void update(Piece p, Square to, Value v) {
+/// PieceToBoards are addressed by a move's [piece][to] information
+typedef StatBoards PieceToBoards;
- if (Gain)
- table[p][to] = std::max(v, table[p][to] - 1);
+/// 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 ButterflyBoards as backing store.
+struct ButterflyHistory : public ButterflyBoards {
- else if (abs(table[p][to] + v) < Max)
- table[p][to] += v;
+ void update(Color c, Move m, int bonus) {
+ StatBoards::update((*this)[c][from_to(m)], bonus, 324);
}
+};
-private:
- T table[PIECE_NB][SQUARE_NB];
+/// PieceToHistory is like ButterflyHistory, but is based on PieceToBoards
+struct PieceToHistory : public PieceToBoards {
+
+ void update(Piece pc, Square to, int bonus) {
+ StatBoards::update((*this)[pc][to], bonus, 936);
+ }
};
-typedef Stats< true, Value> GainsStats;
-typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+/// CounterMoveHistory stores counter moves indexed by [piece][to] of the previous
+/// move, see chessprogramming.wikispaces.com/Countermove+Heuristic
+typedef StatBoards CounterMoveHistory;
+
+/// ContinuationHistory is the history of a given pair of moves, usually the
+/// current one given a previous one. History table is based on PieceToBoards
+/// instead of ButterflyBoards.
+typedef StatBoards ContinuationHistory;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -80,31 +90,29 @@ typedef Stats > CountermovesStats;
/// to get a cut-off first.
class MovePicker {
-
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
-
public:
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, PieceType);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*, Value);
-
- template Move next_move();
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+ MovePicker(const Position&, Move, Value);
+ MovePicker(const Position&, Move, Depth, const ButterflyHistory*, const PieceToHistory**, Square);
+ MovePicker(const Position&, Move, Depth, const ButterflyHistory*, const PieceToHistory**, Move, Move*);
+ Move next_move(bool skipQuiets = false);
private:
template void score();
- void generate_next();
+ ExtMove* begin() { return cur; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
- const HistoryStats& history;
- Search::Stack* ss;
- Move* countermoves;
- Depth depth;
- Move ttMove;
- MoveStack killers[4];
+ const ButterflyHistory* mainHistory;
+ const PieceToHistory** contHistory;
+ Move ttMove, countermove, killers[2];
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ int stage;
Square recaptureSquare;
- int captureThreshold, phase;
- MoveStack *cur, *end, *endQuiets, *endBadCaptures;
- MoveStack moves[MAX_MOVES];
+ Value threshold;
+ Depth depth;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED