X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=21ea9ab3e2292afc1835059cbdfaf8ed74128892;hb=77341f67f30456dc456177062309ad5e73e2e1a4;hp=37027ace23153d1dff36b88446df58d5b4be495d;hpb=4ede49cd850392f28bc9da9537c111d2c3f0b297;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 37027ace..21ea9ab3 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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
#include // For std::max
@@ -35,7 +35,7 @@
/// 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
+/// 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 {
@@ -69,7 +69,7 @@ private:
typedef Stats< true, Value> GainsStats;
typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+typedef Stats > MovesStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -86,7 +86,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*, Move*, Search::Stack*);
template Move next_move();
@@ -98,13 +98,14 @@ private:
const HistoryStats& history;
Search::Stack* ss;
Move* countermoves;
+ Move* followupmoves;
Depth depth;
Move ttMove;
- MoveStack killers[4];
+ ExtMove killers[6];
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