X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.h;h=9459b8c2a389e9e2aec27e830ba078931b845df7;hb=dd5b3086f5f10819c527aa6276ca7a0c54e47900;hp=839d1bd2908ee54f81a9d06bf2450a52b6812a74;hpb=2943e1ca3171341cd301b18280f3fa3b6bdda162;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 839d1bd2..9459b8c2 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,113 +1,64 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
- Glaurung is free software: you can redistribute it and/or modify
+ Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
- Glaurung is distributed in the hope that it will be useful,
+
+ Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-
#if !defined MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "lock.h"
+#include "history.h"
#include "position.h"
+#include "search.h"
+#include "types.h"
-////
-//// Types
-////
-
-/// 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.
+/// 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:
-
- 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_BAD_CAPTURES, // Queen promotions and captures with SEE valuse <= 0
- PH_KILLER_1, // Killer move 1 from the current ply (not used yet).
- PH_KILLER_2, // Killer move 2 from the current ply (not used yet).
- PH_NONCAPTURES, // Non-captures and underpromotions
- PH_EVASIONS, // Check evasions
- PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Checks in quiescence search
- PH_STOP
- };
-
- MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
- Move get_next_move();
- Move get_next_move(Lock &lock);
- int number_of_moves() const;
- int current_move_score() const;
- MovegenPhase current_move_type() const;
- Bitboard discovered_check_candidates() const;
+ MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
- static void init_phase_table();
+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:
void score_captures();
void score_noncaptures();
void score_evasions();
- void score_qcaptures();
- Move pick_move_from_list();
-
+ void generate_next();
+
const Position& pos;
- Move ttMove, mateKiller, killer1, killer2;
- Bitboard pinned, dc;
- MoveStack moves[256], badCaptures[64];
- bool pvNode;
+ const History& H;
+ Search::Stack* ss;
Depth depth;
- int phaseIndex;
- int numOfMoves, numOfBadCaptures;
- int movesPicked, badCapturesPicked;
- bool finished;
+ Move ttMove;
+ MoveStack killers[2];
+ Square recaptureSquare;
+ int captureThreshold, phase;
+ MoveStack *cur, *end, *endQuiets, *endBadCaptures;
+ MoveStack moves[MAX_MOVES];
};
-
-////
-//// 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.
-
-inline int MovePicker::number_of_moves() const {
- return numOfMoves;
-}
-
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
-
-inline Bitboard MovePicker::discovered_check_candidates() const {
- return dc;
-}
-
#endif // !defined(MOVEPICK_H_INCLUDED)