X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.h;h=5896bbefab9e9d0c3876fc44942d41cc8c393d4e;hb=3054db989d28bee4c491811ba81a7933eb37ba14;hp=d0ced0474ffd901e6b34275acf520147001fe506;hpb=8647fbd6ed11c60282e84e4b486a7e8258c88483;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index d0ced047..5896bbef 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,49 +17,92 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include "history.h"
-#include "move.h"
+#include // For std::max
+#include // For std::memset
+
+#include "movegen.h"
#include "position.h"
+#include "search.h"
#include "types.h"
-struct SearchStack;
-/// 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.
+/// 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 {
-class MovePicker {
+ static const Value Max = Value(250);
+
+ 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) {
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+ if (m != table[pc][to])
+ table[pc][to] = m;
+ }
+ void update(Piece pc, Square to, Value v) {
+
+ if (abs(table[pc][to] + v) < Max)
+ table[pc][to] += v;
+ }
+
+private:
+ T table[PIECE_NB][SQUARE_NB];
+};
+
+typedef Stats HistoryStats;
+typedef Stats MovesStats;
+typedef Stats CounterMovesHistoryStats;
+
+
+/// 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.
+
+class MovePicker {
public:
- MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
- MovePicker(const Position&, Move, Depth, const History&);
- MovePicker(const Position&, Move, const History&, int parentCapture);
- Move get_next_move();
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square);
+ MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, PieceType);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*);
+
+ template Move next_move();
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void go_next_phase();
+ template void score();
+ void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
- const History& H;
+ const HistoryStats& history;
+ const CounterMovesHistoryStats& counterMovesHistory;
+ Search::Stack* ss;
+ Move countermove;
Depth depth;
Move ttMove;
- MoveStack killers[2];
- int captureThreshold, phase;
- const uint8_t* phasePtr;
- MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
- MoveStack moves[MAX_MOVES];
+ ExtMove killers[3];
+ Square recaptureSquare;
+ Value captureThreshold;
+ int stage;
+ ExtMove *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED