X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=c444615f5b9f2e8ab4a0952ff47e3c97bf642079;hb=002062ae934c1fae3e56157e8e7e6451b552ada5;hp=90475b3512e15dba6939a4fde9fd130305b15eb1;hpb=c7e31d5aa8e7b51f6580dc0c2a51e2aee15eb817;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 90475b35..c444615f 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -17,11 +17,11 @@
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"
@@ -30,20 +30,29 @@
/// The Stats struct stores moves statistics. According to the template parameter
-/// the class can store both History and Gains type statistics. 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. Entries are stored according only to moving piece and
-/// destination square, in particular two moves with different origin but same
-/// destination and same piece will be considered identical.
-template
+/// 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);
- const Value* operator[](Piece p) const { return &table[p][0]; }
- void clear() { memset(table, 0, sizeof(table)); }
+ const T* operator[](Piece p) const { return table[p]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
+
+ void update(Piece p, Square to, Move m) {
+
+ if (m == table[p][to].first)
+ return;
+
+ table[p][to].second = table[p][to].first;
+ table[p][to].first = m;
+ }
void update(Piece p, Square to, Value v) {
@@ -55,23 +64,13 @@ struct Stats {
}
private:
- Value table[PIECE_NB][SQUARE_NB];
+ T table[PIECE_NB][SQUARE_NB];
};
-typedef Stats History;
-typedef Stats Gains;
-
-// FIXME: Document me
-struct RefutationTable {
+typedef Stats< true, Value> GainsStats;
+typedef Stats HistoryStats;
+typedef Stats > CountermovesStats;
- void clear() { memset(table, 0, sizeof(table)); }
- void update(Piece p, Square to, Move m) { table[p][to] = m; }
- Move get(Piece p, Square to) const { return table[p][to]; }
-
-private:
- Move table[PIECE_NB][SQUARE_NB]; // Mapping: "move A" -> "move B which refutes move A"
-
-};
/// 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
@@ -85,9 +84,10 @@ class MovePicker {
MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
public:
- MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Move, Value);
- MovePicker(const Position&, Move, Depth, const History&, Square);
- MovePicker(const Position&, Move, const History&, PieceType);
+ 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*);
+
template Move next_move();
private:
@@ -95,15 +95,16 @@ private:
void generate_next();
const Position& pos;
- const History& Hist;
+ const HistoryStats& history;
Search::Stack* ss;
+ Move* countermoves;
Depth depth;
Move ttMove;
- MoveStack killers[3];
+ ExtMove killers[4];
Square recaptureSquare;
- int captureThreshold, phase;
- MoveStack *cur, *end, *endQuiets, *endBadCaptures;
- MoveStack moves[MAX_MOVES];
+ int captureThreshold, stage;
+ ExtMove *cur, *end, *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED