X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=44fc51f6263d73ca5a88919ff044e3e6b256cc12;hp=b31d9dd2d48dafbdc3fc1f985e58189f645f5404;hb=27efc5ac996ffc679395317c8bbb16aca996296c;hpb=9ab84a816539ade23868f0383e39634e6ab88df5
diff --git a/src/movepick.h b/src/movepick.h
index b31d9dd2..44fc51f6 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-2009 Marco Costalba
+ 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,97 +17,97 @@
along with this program. If not, see .
*/
-
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-////
-//// Includes
-////
+#include // For std::max
+#include // For std::memset
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
+#include "movegen.h"
#include "position.h"
+#include "search.h"
+#include "types.h"
-////
-//// Types
-////
+/// The Stats struct stores moves statistics. According to the template parameter
+/// 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 {
-struct SearchStack;
+ static const Value Max = Value(250);
-enum MovegenPhase {
- PH_NULL_MOVE, // Null move
- PH_TT_MOVES, // Transposition table move and mate killer
- PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_KILLERS, // Killer moves from the current ply
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Non-capture checks in quiescence search
- PH_STOP
-};
+ const T* operator[](Piece pc) const { return table[pc]; }
+ T* operator[](Piece pc) { return table[pc]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
-typedef uint8_t MovegenPhaseT;
+ void update(Piece pc, Square to, Move m) {
-/// MovePicker is a class which is used to pick one 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::pick_next_move(), which returns a new legal move each time it
-/// is called, until there are no legal 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 be strongest first.
+ if (m != table[pc][to])
+ table[pc][to] = m;
+ }
-class MovePicker {
+ void update(Piece pc, Square to, Value v) {
- MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
+ if (Gain)
+ table[pc][to] = std::max(v, table[pc][to] - 1);
-public:
- MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, bool useNullMove = false);
- Move get_next_move();
- Move get_next_move(Lock& lock);
- int number_of_moves() const;
- Bitboard discovered_check_candidates() const;
+ else if (abs(table[pc][to] + v) < Max)
+ table[pc][to] += v;
+ }
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- void go_next_phase();
-
- const Position& pos;
- const History& H;
- MoveStack ttMoves[2], killers[2];
- bool finished;
- int numOfBadCaptures, phase;
- const MovegenPhaseT* phasePtr;
- MoveStack *curMove, *lastMove;
- Bitboard dc, pinned;
- MoveStack moves[256], badCaptures[64];
+ T table[PIECE_NB][SQUARE_NB];
};
+typedef Stats< true, Value> GainsStats;
+typedef Stats HistoryStats;
+typedef Stats MovesStats;
+typedef Stats CounterMovesHistoryStats;
-////
-//// Inline functions
-////
-/// MovePicker::number_of_moves() simply returns the numOfMoves member
-/// variable. It is intended to be used in positions where the side to move
-/// is in check, for detecting checkmates or situations where there is only
-/// a single reply to check.
+/// 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.
-inline int MovePicker::number_of_moves() const {
- return int(lastMove - moves);
-}
+class MovePicker {
+public:
+ 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();
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
+private:
+ template void score();
+ void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
-inline Bitboard MovePicker::discovered_check_candidates() const {
- return dc;
-}
+ const Position& pos;
+ const HistoryStats& history;
+ const CounterMovesHistoryStats& counterMovesHistory;
+ Search::Stack* ss;
+ Move countermove;
+ Depth depth;
+ Move ttMove;
+ 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