X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=4c2beb96378c5d68fa16d36d0302e76b1dabeda6;hb=bd04f9a0f1238c396e5503e07375ae90d7b5cfa8;hp=9459b8c2a389e9e2aec27e830ba078931b845df7;hpb=834bd9edd79d11566ec3556945a858d2d84a726b;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 9459b8c2..4c2beb96 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 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,15 +18,55 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include "history.h"
+#include // For std::max
+#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 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.
+/// Countermoves store the move that refute a previous one. 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 {
+
+ static const Value Max = Value(1 << 28);
+
+ 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, Value v) {
+
+ if (abs(int(v)) >= 324)
+ return;
+
+ table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324);
+ table[pc][to] += int(v) * 32;
+ }
+
+private:
+ T table[PIECE_NB][SQUARE_NB];
+};
+
+typedef Stats MoveStats;
+typedef Stats HistoryStats;
+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,
@@ -34,31 +75,37 @@
/// to get a cut-off first.
class MovePicker {
+public:
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+ MovePicker(const Position&, Move, const HistoryStats&, Value);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&,
+ const CounterMoveStats&, const CounterMoveStats&, Move, Search::Stack*);
-public:
- MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
- MovePicker(const Position&, Move, Depth, const History&, Square);
- MovePicker(const Position&, Move, const History&, PieceType);
- template Move next_move();
+ Move next_move();
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void generate_next();
+ template void score();
+ void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
- const History& H;
+ const HistoryStats& history;
+ const CounterMoveStats* counterMoveHistory;
+ const CounterMoveStats* followupMoveHistory;
Search::Stack* ss;
+ Move countermove;
Depth depth;
Move ttMove;
- MoveStack killers[2];
+ ExtMove killers[3];
Square recaptureSquare;
- int captureThreshold, phase;
- MoveStack *cur, *end, *endQuiets, *endBadCaptures;
- MoveStack moves[MAX_MOVES];
+ Value threshold;
+ int stage;
+ ExtMove *endQuiets, *endBadCaptures = moves + MAX_MOVES - 1;
+ ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED