mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-06 10:53:50 +08:00
Teach MovePicker::get_next_move() to return move type
This will be used in future patches. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
@@ -36,26 +36,9 @@
|
||||
|
||||
namespace {
|
||||
|
||||
/// Types
|
||||
|
||||
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
|
||||
};
|
||||
|
||||
|
||||
/// Variables
|
||||
|
||||
MovegenPhase PhaseTable[32];
|
||||
MovePicker::MovegenPhase PhaseTable[32];
|
||||
int MainSearchPhaseIndex;
|
||||
int EvasionsPhaseIndex;
|
||||
int QsearchWithChecksPhaseIndex;
|
||||
@@ -109,7 +92,7 @@ MovePicker::MovePicker(Position &p, bool pvnode, Move ttm, Move mk,
|
||||
/// class. It returns a new legal move every time it is called, until there
|
||||
/// are no more moves left of the types we are interested in.
|
||||
|
||||
Move MovePicker::get_next_move() {
|
||||
Move MovePicker::get_next_move(MovegenPhase* moveType) {
|
||||
Move move;
|
||||
|
||||
while(true) {
|
||||
@@ -123,6 +106,9 @@ Move MovePicker::get_next_move() {
|
||||
|
||||
// Next phase:
|
||||
phaseIndex++;
|
||||
if (moveType)
|
||||
*moveType = PhaseTable[phaseIndex];
|
||||
|
||||
switch(PhaseTable[phaseIndex]) {
|
||||
|
||||
case PH_TT_MOVE:
|
||||
|
||||
@@ -44,9 +44,24 @@
|
||||
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(Position &p, bool pvnode, Move ttm, Move mk, Move k1, Move k2,
|
||||
Depth dpth);
|
||||
Move get_next_move();
|
||||
Move get_next_move(MovegenPhase* moveType = NULL);
|
||||
Move get_next_move(Lock &lock);
|
||||
int number_of_moves() const;
|
||||
int current_move_score() const;
|
||||
|
||||
Reference in New Issue
Block a user