X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=ae2ee3814ea838acf096ef3c73d3135892b16607;hp=57fe1c0ec304a76fd2542e97876c811eac92b6d2;hb=b1b19343cd1f5ec65084dc11a0a0b4d5ece2a24b;hpb=38cfbeeb50c7dde79450f1b44171d5655e555ae5
diff --git a/src/movepick.h b/src/movepick.h
index 57fe1c0e..ae2ee381 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,71 @@
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 memset
+#include // For std::memset
#include "movegen.h"
#include "position.h"
-#include "search.h"
#include "types.h"
-/// 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 {
+/// 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 {
+
+ static const int Max = 1 << 28;
- static const Value Max = Value(2000);
+ 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) {
- const T* operator[](Piece p) const { return table[p]; }
- void clear() { memset(table, 0, sizeof(table)); }
+ Square from = from_sq(m);
+ Square to = to_sq(m);
- void update(Piece p, Square to, Move m) {
+ const int D = 324;
- if (m == table[p][to].first)
- return;
+ assert(abs(int(v)) <= D); // Consistency check for below formula
- table[p][to].second = table[p][to].first;
- table[p][to].first = m;
+ table[c][from][to] -= table[c][from][to] * abs(int(v)) / D;
+ table[c][from][to] += int(v) * 32;
}
- void update(Piece p, Square to, Value v) {
+private:
+ int table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+};
+
- if (Gain)
- table[p][to] = std::max(v, table[p][to] - 1);
+/// 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) {
- else if (abs(table[p][to] + v) < Max)
- table[p][to] += 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< true, Value> GainsStats;
-typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+typedef Stats MoveStats;
+typedef Stats CounterMoveStats;
+typedef Stats CounterMoveHistoryStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -78,33 +91,35 @@ typedef Stats > CountermovesStats;
/// 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 {
-
- 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);
+ 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*);
- template Move next_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;
+ const Search::Stack* ss;
+ Move killers[2];
+ Move countermove;
Depth depth;
Move ttMove;
- MoveStack killers[4];
Square recaptureSquare;
- int captureThreshold, phase;
- MoveStack *cur, *end, *endQuiets, *endBadCaptures;
- MoveStack moves[MAX_MOVES];
+ Value threshold;
+ int stage;
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED