X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=afd573ea459badabd1aa208b5d6dd498d49d455b;hb=44236f4ed9844598e1cb065937c3770a938964b2;hp=3ade58edf3f9e7eac3975ded6e9d7157848f0d7e;hpb=351ef5c85b6d4b9c71e9da367f0be5ab6e6f8117;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 3ade58ed..afd573ea 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-2010 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,50 +18,107 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include "history.h"
-#include "move.h"
+#include
+
+#include "movegen.h"
#include "position.h"
#include "types.h"
-struct SearchStack;
+/// StatBoards is a generic 2-dimensional array used to store various statistics
+template
+struct StatBoards : public std::array, Size1> {
-/// MovePicker is a class which is used to pick one pseudo 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::get_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.
+ void fill(const T& v) {
+ T* p = &(*this)[0][0];
+ std::fill(p, p + sizeof(*this) / sizeof(*p), v);
+ }
+};
-class MovePicker {
+/// 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;
+
+/// PieceToBoards are addressed by a move's [piece][to] information
+typedef StatBoards PieceToBoards;
+
+/// 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 {
+
+ void update(Color c, Move m, int bonus) {
+
+ const int D = 324;
+ auto& entry = (*this)[c][from_to(m)];
+
+ assert(abs(bonus) <= D); // Consistency check for below formula
+
+ entry += bonus * 32 - entry * abs(bonus) / D;
+
+ assert(abs(entry) <= 32 * D);
+ }
+};
+
+/// PieceToHistory is like ButterflyHistory, but is based on PieceToBoards
+struct PieceToHistory : public PieceToBoards {
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+ void update(Piece pc, Square to, int bonus) {
+ const int D = 936;
+ auto& entry = (*this)[pc][to];
+
+ assert(abs(bonus) <= D); // Consistency check for below formula
+
+ entry += bonus * 32 - entry * abs(bonus) / D;
+
+ assert(abs(entry) <= 32 * D);
+ }
+};
+
+/// 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
+/// 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 {
public:
- MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
- MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
- MovePicker(const Position&, Move, const History&, PieceType parentCapture);
- Move get_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:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void go_next_phase();
+ template void score();
+ ExtMove* begin() { return cur; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
- const History& H;
- Depth depth;
- Move ttMove;
- MoveStack killers[2];
+ const ButterflyHistory* mainHistory;
+ const PieceToHistory** contHistory;
+ Move ttMove, countermove, killers[2];
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ int stage;
Square recaptureSquare;
- int captureThreshold, phase;
- const uint8_t* phasePtr;
- MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
- MoveStack moves[MAX_MOVES];
+ Value threshold;
+ Depth depth;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED