X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.h;h=6fbd8be1387fc46ce277a03f29a1f2442171ac19;hb=797602938da5087d0af2448a72767cb17cd8c248;hp=b2a8dc98bbe1b38096b27f78a984620bb24a9ebd;hpb=5b8ca1eee77b736c35b418b1cb11da9fc66f83e0;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index b2a8dc98..6fbd8be1 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-2010 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,48 +18,106 @@
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"
-/// MovePicker is a class which is used to pick one pseudo legal move at a time
-/// from the current position. It is initialized with a Position object and a few
-/// moves we have reason to believe are good. The most important method is
-/// MovePicker::get_next_move(), which returns a new pseudo legal move each time
-/// it is called, until there are no moves left, when MOVE_NONE is returned.
-/// In order to improve the efficiency of the alpha beta algorithm, MovePicker
-/// attempts to return the moves which are most likely to get a cut-off first.
-class MovePicker {
+/// 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;
+
+struct FromToStats {
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+ Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
+ void update(Color c, Move m, Value v) {
+ if (abs(int(v)) >= 324)
+ return;
+
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+
+ table[c][from][to] -= table[c][from][to] * abs(int(v)) / 324;
+ table[c][from][to] += int(v) * 32;
+ }
+
+private:
+ Value table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+};
+
+
+/// 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,
+/// when MOVE_NONE is returned. In order to improve the efficiency of the alpha
+/// beta algorithm, MovePicker attempts to return the moves which are most likely
+/// to get a cut-off first.
+namespace Search { struct Stack; }
+
+class MovePicker {
public:
- MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
- MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
- MovePicker(const Position&, Move, const History&, PieceType parentCapture);
- Move get_next_move();
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+
+ MovePicker(const Position&, Move, Value);
+ MovePicker(const Position&, Move, Depth, Square);
+ MovePicker(const Position&, Move, Depth, Search::Stack*);
+
+ Move next_move();
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void go_next_phase();
+ template void score();
+ ExtMove* begin() { return cur; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
- const History& H;
+ const Search::Stack* ss;
+ Move countermove;
Depth depth;
Move ttMove;
- MoveStack killers[2];
Square recaptureSquare;
- int captureThreshold, phase;
- const uint8_t* phasePtr;
- MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
- MoveStack moves[MAX_MOVES];
+ Value threshold;
+ int stage;
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED