X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=93061ee6fc6a81c8aaf277b817dab41a0d02dd34;hp=5fbaa688631f9e97864820e6254648179c0cbe08;hb=a518d5d3adf0709471be906fd03ee4744477a214;hpb=77547a4ef149d3ac59177d4b1f2b4f807063baf6
diff --git a/src/movepick.h b/src/movepick.h
index 5fbaa688..93061ee6 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,19 @@
/// The Stats struct stores moves statistics. According to the template parameter
-/// the class can store History, Gains and Countermoves. History records how often
+/// 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. Gains records the move's
-/// best evaluation gain from one ply to the next and is used for pruning decisions.
+/// and is used for reduction and move ordering 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
+template
struct Stats {
static const Value Max = Value(2000);
const T* operator[](Piece p) const { return table[p]; }
- void clear() { memset(table, 0, sizeof(table)); }
+ void clear() { std::memset(table, 0, sizeof(table)); }
void update(Piece p, Square to, Move m) {
@@ -56,10 +55,7 @@ struct Stats {
void update(Piece p, Square to, Value v) {
- if (Gain)
- table[p][to] = std::max(v, table[p][to] - 1);
-
- else if (abs(table[p][to] + v) < Max)
+ if (abs(table[p][to] + v) < Max)
table[p][to] += v;
}
@@ -67,9 +63,8 @@ private:
T table[PIECE_NB][SQUARE_NB];
};
-typedef Stats< true, Value> GainsStats;
-typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+typedef Stats HistoryStats;
+typedef Stats > CountermovesStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -86,7 +81,7 @@ class MovePicker {
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 Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
template Move next_move();
@@ -97,13 +92,14 @@ private:
const Position& pos;
const HistoryStats& history;
Search::Stack* ss;
+ Move* countermoves;
Depth depth;
Move ttMove;
- MoveStack killers[4];
+ 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