X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.h;h=3e472fb6d25b83086f9167a5de70aadb9c217d7c;hb=0c1b40c5e295c73516cd044f027e12646e3fdbc9;hp=920a97573029fedb093e0ba981e5c188b620df36;hpb=20224a5bbf2844b5b64eec1de199c2d51b8d93d4;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 920a9757..3e472fb6 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-2013 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,100 +17,82 @@
along with this program. If not, see .
*/
-
#if !defined MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-////
-//// Includes
-////
+#include // For std::max
+#include // For memset
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
+#include "movegen.h"
#include "position.h"
+#include "search.h"
+#include "types.h"
-////
-//// Types
-////
-
-struct EvalInfo;
-struct SearchStack;
+/// The Stats struct stores moves statistics. According to the template parameter
+/// the class can store both History and Gains type statistics. 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. Entries are stored according only to moving piece and
+/// destination square, in particular two moves with different origin but same
+/// destination and same piece will be considered identical.
+template
+struct Stats {
-/// 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.
+ static const Value Max = Value(2000);
-class MovePicker {
+ const Value* operator[](Piece p) const { return &table[p][0]; }
+ void clear() { memset(table, 0, sizeof(table)); }
- MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
+ void update(Piece p, Square to, Value v) {
-public:
+ if (Gain)
+ table[p][to] = std::max(v, table[p][to] - 1);
- enum MovegenPhase {
- PH_TT_MOVE, // Transposition table move
- PH_MATE_KILLER, // Mate killer from the current ply
- 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
- };
-
- MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
- Move get_next_move();
- Move get_next_move(Lock& lock);
- int number_of_moves() const;
- Bitboard discovered_check_candidates() const;
-
- static void init_phase_table();
+ else if (abs(table[p][to] + v) < Max)
+ table[p][to] += v;
+ }
private:
- void score_captures();
- void score_noncaptures();
- void score_evasions();
- Move pick_move_from_list();
-
- const Position& pos;
- const History& H;
- Move ttMove, mateKiller, killer1, killer2;
- Bitboard pinned, dc;
- MoveStack moves[256], badCaptures[64];
- int phaseIndex;
- int numOfMoves, numOfBadCaptures;
- int movesPicked;
- bool checkKillers, checkLegal;
- bool finished;
+ Value table[PIECE_NB][SQUARE_NB];
};
+typedef Stats History;
+typedef Stats Gains;
-////
-//// 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 numOfMoves;
-}
+class MovePicker {
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
+ MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
-inline Bitboard MovePicker::discovered_check_candidates() const {
- return dc;
-}
+public:
+ MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
+ MovePicker(const Position&, Move, Depth, const History&, Square);
+ MovePicker(const Position&, Move, const History&, PieceType);
+ template Move next_move();
+
+private:
+ template void score();
+ void generate_next();
+
+ const Position& pos;
+ const History& Hist;
+ Search::Stack* ss;
+ Depth depth;
+ Move ttMove;
+ MoveStack killers[2];
+ Square recaptureSquare;
+ int captureThreshold, phase;
+ MoveStack *cur, *end, *endQuiets, *endBadCaptures;
+ MoveStack moves[MAX_MOVES];
+};
#endif // !defined(MOVEPICK_H_INCLUDED)