X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.h;h=b9d2594af114e447d987d39ec9edfc12a8cd8955;hb=7b4828b68ced7e92a3399f9e48da8726b6b315f0;hp=90475b3512e15dba6939a4fde9fd130305b15eb1;hpb=c7e31d5aa8e7b51f6580dc0c2a51e2aee15eb817;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 90475b35..b9d2594a 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,7 @@
/*
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-2014 Marco Costalba, Joona Kiiski, 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,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,49 +30,48 @@
/// 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
+/// 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(2000);
+ static const Value Max = Value(250);
- const Value* operator[](Piece p) const { return &table[p][0]; }
- void clear() { memset(table, 0, sizeof(table)); }
+ const T* operator[](Piece pc) const { return table[pc]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
- void update(Piece p, Square to, Value v) {
+ void update(Piece pc, Square to, Move m) {
- if (Gain)
- table[p][to] = std::max(v, table[p][to] - 1);
+ if (m == table[pc][to].first)
+ return;
- else if (abs(table[p][to] + v) < Max)
- table[p][to] += v;
+ table[pc][to].second = table[pc][to].first;
+ table[pc][to].first = m;
}
-private:
- Value table[PIECE_NB][SQUARE_NB];
-};
+ void update(Piece pc, Square to, Value v) {
-typedef Stats History;
-typedef Stats Gains;
-
-// FIXME: Document me
-struct RefutationTable {
+ if (Gain)
+ table[pc][to] = std::max(v, table[pc][to] - 1);
- 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]; }
+ else if (abs(table[pc][to] + v) < Max)
+ table[pc][to] += v;
+ }
private:
- Move table[PIECE_NB][SQUARE_NB]; // Mapping: "move A" -> "move B which refutes move A"
-
+ T table[PIECE_NB][SQUARE_NB];
};
+typedef Stats< true, Value> GainsStats;
+typedef Stats HistoryStats;
+typedef Stats > MovesStats;
+
+
/// 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,
@@ -85,25 +84,29 @@ 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*, Move*, Search::Stack*);
+
template Move next_move();
private:
template void score();
- void generate_next();
+ void generate_next_stage();
const Position& pos;
- const History& Hist;
+ const HistoryStats& history;
Search::Stack* ss;
+ Move* countermoves;
+ Move* followupmoves;
Depth depth;
Move ttMove;
- MoveStack killers[3];
+ ExtMove killers[6];
Square recaptureSquare;
- int captureThreshold, phase;
- MoveStack *cur, *end, *endQuiets, *endBadCaptures;
- MoveStack moves[MAX_MOVES];
+ Value captureThreshold;
+ int stage;
+ ExtMove *cur, *end, *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED