X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=1a81dbde7b21a2bc4fe3535dfb7fe2ccbf71a36e;hb=49a9d4cf99e56d071af3060b3f306b9daa0a62a6;hp=d97bb62909c71ceb38ed0affba20216994b99bd2;hpb=afae86bfb49471113f14f9f0f56f2a08d052242f;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index d97bb629..1a81dbde 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,58 +18,107 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include "depth.h"
-#include "history.h"
+#include // For std::memset
+
+#include "movegen.h"
#include "position.h"
+#include "types.h"
-struct SearchStack;
-/// 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.
+/// HistoryStats records how often quiet moves have been successful or unsuccessful
+/// during the current search, and is used for reduction and move ordering decisions.
+struct HistoryStats {
-class MovePicker {
+ static const int Max = 1 << 28;
- MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
+ int get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
+ void update(Color c, Move m, int v) {
-public:
- MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value beta);
- MovePicker(const Position& p, Move ttm, Depth d, const History& h);
- Move get_next_move();
- int number_of_evasions() const;
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+
+ const int D = 324;
+
+ assert(abs(int(v)) <= D); // Consistency check for below formula
+
+ table[c][from][to] -= table[c][from][to] * abs(int(v)) / D;
+ table[c][from][to] += int(v) * 32;
+ }
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void go_next_phase();
+ int table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+};
- const Position& pos;
- const History& H;
- Bitboard pinned;
- MoveStack ttMoves[2], killers[2];
- int badCaptureThreshold, phase;
- const uint8_t* phasePtr;
- MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
- MoveStack moves[MOVES_MAX];
+
+/// A template struct, used to generate MoveStats and CounterMoveHistoryStats:
+/// MoveStats store the move that refute a previous one.
+/// CounterMoveHistoryStats is like HistoryStats, but with two consecutive moves.
+/// Entries are stored using only the moving piece and destination square, hence
+/// two moves with different origin but same destination and piece will be
+/// considered identical.
+template
+struct Stats {
+ const T* operator[](Piece pc) const { return table[pc]; }
+ T* operator[](Piece pc) { return table[pc]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
+ void update(Piece pc, Square to, Move m) { table[pc][to] = m; }
+ void update(Piece pc, Square to, int v) {
+
+ const int D = 936;
+
+ assert(abs(int(v)) <= D); // Consistency check for below formula
+
+ table[pc][to] -= table[pc][to] * abs(int(v)) / D;
+ table[pc][to] += int(v) * 32;
+ }
+
+private:
+ T table[PIECE_NB][SQUARE_NB];
};
+typedef Stats MoveStats;
+typedef Stats CounterMoveStats;
+typedef Stats CounterMoveHistoryStats;
+
+
+/// 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.
+namespace Search { struct Stack; }
+
+class MovePicker {
+public:
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+
+ MovePicker(const Position&, Move, Value);
+ MovePicker(const Position&, Move, Depth, Square);
+ MovePicker(const Position&, Move, Depth, Search::Stack*);
+
+ Move next_move(bool skipQuiets = false);
-/// MovePicker::number_of_evasions() simply returns the number of moves in
-/// evasions phase. 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.
-/// WARNING: It works as long as PH_EVASIONS is the _only_ phase for evasions.
+private:
+ template void score();
+ ExtMove* begin() { return cur; }
+ ExtMove* end() { return endMoves; }
-inline int MovePicker::number_of_evasions() const {
- return int(lastMove - moves);
-}
+ const Position& pos;
+ const Search::Stack* ss;
+ Move countermove;
+ Depth depth;
+ Move ttMove;
+ Square recaptureSquare;
+ Value threshold;
+ int stage;
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
+};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED