X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=6c3f4264dec1af0745aa575d2802f56ad39e362f;hp=235191af96bdad297144123f662dd1f503aba2f5;hb=7c267587fc7f454182b4d527607bcf8fdbd8c41c;hpb=52487c4f043024213c90f6f279d0479e90bce929
diff --git a/src/movepick.cpp b/src/movepick.cpp
index 235191af..6c3f4264 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -1,17 +1,19 @@
/*
- 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 Marco Costalba
- 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 .
*/
@@ -24,6 +26,7 @@
#include
#include "history.h"
+#include "evaluate.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
@@ -36,26 +39,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;
@@ -76,30 +62,31 @@ namespace {
/// search captures, promotions and some checks) and about how important good
/// move ordering is at the current node.
-MovePicker::MovePicker(Position &p, bool pvnode, Move ttm, Move mk,
- Move k1, Move k2, Depth dpth) {
- pos = &p;
- pvNode = pvnode;
+MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
+ const SearchStack& ss, Depth d) : pos(p) {
+ pvNode = pv;
ttMove = ttm;
- mateKiller = (mk == ttm)? MOVE_NONE : mk;
- killer1 = k1;
- killer2 = k2;
- depth = dpth;
+ mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
+ killer1 = ss.killers[0];
+ killer2 = ss.killers[1];
+ depth = d;
movesPicked = 0;
numOfMoves = 0;
numOfBadCaptures = 0;
- dc = p.discovered_check_candidates(p.side_to_move());
-
- if(p.is_check())
- phaseIndex = EvasionsPhaseIndex;
- else if(depth > Depth(0))
- phaseIndex = MainSearchPhaseIndex;
- else if(depth == Depth(0))
- phaseIndex = QsearchWithChecksPhaseIndex;
+
+ if (p.is_check())
+ phaseIndex = EvasionsPhaseIndex;
+ else if (depth > Depth(0))
+ phaseIndex = MainSearchPhaseIndex;
+ else if (depth == Depth(0))
+ phaseIndex = QsearchWithChecksPhaseIndex;
else
- phaseIndex = QsearchWithoutChecksPhaseIndex;
+ phaseIndex = QsearchWithoutChecksPhaseIndex;
- pinned = p.pinned_pieces(p.side_to_move());
+ Color us = pos.side_to_move();
+
+ dc = p.discovered_check_candidates(us);
+ pinned = p.pinned_pieces(us);
finished = false;
}
@@ -110,92 +97,84 @@ MovePicker::MovePicker(Position &p, bool pvnode, Move ttm, Move mk,
/// are no more moves left of the types we are interested in.
Move MovePicker::get_next_move() {
+
Move move;
- while(true) {
+ while (true)
+ {
// If we already have a list of generated moves, pick the best move from
- // the list, and return it:
- move = this->pick_move_from_list();
- if(move != MOVE_NONE) {
- assert(move_is_ok(move));
- return move;
+ // the list, and return it.
+ move = pick_move_from_list();
+ if (move != MOVE_NONE)
+ {
+ assert(move_is_ok(move));
+ return move;
}
- // Next phase:
+ // Next phase
phaseIndex++;
- switch(PhaseTable[phaseIndex]) {
+ switch (PhaseTable[phaseIndex]) {
case PH_TT_MOVE:
- if(ttMove != MOVE_NONE) {
- assert(move_is_ok(ttMove));
- Move m = generate_move_if_legal(*pos, ttMove, pinned);
- if(m != MOVE_NONE) {
- assert(m == ttMove);
- return m;
+ if (ttMove != MOVE_NONE)
+ {
+ assert(move_is_ok(ttMove));
+ if (move_is_legal(pos, ttMove, pinned))
+ return ttMove;
}
- }
- break;
+ break;
case PH_MATE_KILLER:
- if(mateKiller != MOVE_NONE) {
- assert(move_is_ok(mateKiller));
- Move m = generate_move_if_legal(*pos, mateKiller, pinned);
- if(m != MOVE_NONE) {
- assert(m == mateKiller);
- return m;
+ if (mateKiller != MOVE_NONE)
+ {
+ assert(move_is_ok(mateKiller));
+ if (move_is_legal(pos, mateKiller, pinned))
+ return mateKiller;
}
- }
- break;
+ break;
case PH_GOOD_CAPTURES:
- // pinned = pos->pinned_pieces(pos->side_to_move());
- numOfMoves = generate_captures(*pos, moves);
- this->score_captures();
- movesPicked = 0;
- break;
+ numOfMoves = generate_captures(pos, moves);
+ score_captures();
+ movesPicked = 0;
+ break;
case PH_BAD_CAPTURES:
- badCapturesPicked = 0;
- break;
+ movesPicked = 0;
+ break;
case PH_NONCAPTURES:
- numOfMoves = generate_noncaptures(*pos, moves);
- this->score_noncaptures();
- movesPicked = 0;
- break;
+ numOfMoves = generate_noncaptures(pos, moves);
+ score_noncaptures();
+ movesPicked = 0;
+ break;
case PH_EVASIONS:
- assert(pos->is_check());
- // pinned = pos->pinned_pieces(pos->side_to_move());
- numOfMoves = generate_evasions(*pos, moves);
- this->score_evasions();
- movesPicked = 0;
- break;
+ assert(pos.is_check());
+ numOfMoves = generate_evasions(pos, moves, pinned);
+ score_evasions();
+ movesPicked = 0;
+ break;
case PH_QCAPTURES:
- // pinned = pos->pinned_pieces(pos->side_to_move());
- numOfMoves = generate_captures(*pos, moves);
- this->score_qcaptures();
- movesPicked = 0;
- break;
+ numOfMoves = generate_captures(pos, moves);
+ score_qcaptures();
+ movesPicked = 0;
+ break;
case PH_QCHECKS:
- numOfMoves = generate_checks(*pos, moves, dc);
- movesPicked = 0;
- break;
+ numOfMoves = generate_non_capture_checks(pos, moves, dc);
+ movesPicked = 0;
+ break;
case PH_STOP:
- return MOVE_NONE;
+ return MOVE_NONE;
default:
- assert(false);
- return MOVE_NONE;
+ assert(false);
+ return MOVE_NONE;
}
}
-
- assert(false);
-
- return MOVE_NONE;
}
@@ -203,37 +182,26 @@ Move MovePicker::get_next_move() {
/// prevent multiple threads from picking the same move at a split point.
Move MovePicker::get_next_move(Lock &lock) {
- Move m;
lock_grab(&lock);
- if(finished) {
- lock_release(&lock);
- return MOVE_NONE;
+ if (finished)
+ {
+ lock_release(&lock);
+ return MOVE_NONE;
}
- m = this->get_next_move();
- if(m == MOVE_NONE)
- finished = true;
+ Move m = get_next_move();
+ if (m == MOVE_NONE)
+ finished = true;
+
lock_release(&lock);
-
return m;
}
-
-/// 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.
-
-int MovePicker::number_of_moves() const {
- return numOfMoves;
-}
-
/// MovePicker::score_captures(), MovePicker::score_noncaptures(),
/// MovePicker::score_evasions() and MovePicker::score_qcaptures() assign a
/// numerical move ordering score to each move in a move list. The moves
-/// with highest scores will be picked first by
-/// MovePicker::pick_move_from_list().
+/// with highest scores will be picked first by pick_move_from_list().
void MovePicker::score_captures() {
// Winning and equal captures in the main search are ordered by MVV/LVA.
@@ -242,226 +210,234 @@ void MovePicker::score_captures() {
// capture, capturing a more valuable (but sufficiently defended) piece
// first usually doesn't hurt. The opponent will have to recapture, and
// the hanging piece will still be hanging (except in the unusual cases
- // where it is possible to recapture with the hanging piece). Exchanging
+ // where it is possible to recapture with the hanging piece). Exchanging
// big pieces before capturing a hanging piece probably helps to reduce
// the subtree size.
- for(int i = 0; i < numOfMoves; i++) {
- int seeValue = pos->see(moves[i].move);
- if(seeValue >= 0) {
- if(move_promotion(moves[i].move))
- moves[i].score = QueenValueMidgame;
- else
- moves[i].score =
- int(pos->midgame_value_of_piece_on(move_to(moves[i].move))) -
- int(pos->type_of_piece_on(move_from(moves[i].move)));
- }
- else
- moves[i].score = seeValue;
-
+ // While scoring captures it moves all captures with negative SEE values
+ // to the badCaptures[] array.
+ Move m;
+ int seeValue;
+
+ for (int i = 0; i < numOfMoves; i++)
+ {
+ m = moves[i].move;
+ seeValue = pos.see(m);
+ if (seeValue >= 0)
+ {
+ if (move_promotion(m))
+ moves[i].score = QueenValueMidgame;
+ else
+ moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
+ -int(pos.type_of_piece_on(move_from(m)));
+ }
+ else
+ {
+ // Losing capture, move it to the badCaptures[] array
+ assert(numOfBadCaptures < 63);
+ moves[i].score = seeValue;
+ badCaptures[numOfBadCaptures++] = moves[i];
+ moves[i--] = moves[--numOfMoves];
+ }
}
}
void MovePicker::score_noncaptures() {
- for(int i = 0; i < numOfMoves; i++) {
- Move m = moves[i].move;
- if(m == killer1)
- moves[i].score = HistoryMax + 2;
- else if(m == killer2)
- moves[i].score = HistoryMax + 1;
- else
- moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m);
+ // First score by history, when no history is available then use
+ // piece/square tables values. This seems to be better then a
+ // random choice when we don't have an history for any move.
+ Move m;
+ int hs;
+
+ for (int i = 0; i < numOfMoves; i++)
+ {
+ m = moves[i].move;
+
+ if (m == killer1)
+ hs = HistoryMax + 2;
+ else if (m == killer2)
+ hs = HistoryMax + 1;
+ else
+ hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
+
+ // Ensure history is always preferred to pst
+ if (hs > 0)
+ hs += 1000;
+
+ // pst based scoring
+ moves[i].score = hs + pos.mg_pst_delta(m);
}
}
void MovePicker::score_evasions() {
- for(int i = 0; i < numOfMoves; i++) {
- Move m = moves[i].move;
- if(m == ttMove)
- moves[i].score = 2*HistoryMax;
- else if(!pos->square_is_empty(move_to(m))) {
- int seeScore = pos->see(m);
- moves[i].score = (seeScore >= 0)? seeScore + HistoryMax : seeScore;
- }
- else
- moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m);
+
+ for (int i = 0; i < numOfMoves; i++)
+ {
+ Move m = moves[i].move;
+ if (m == ttMove)
+ moves[i].score = 2*HistoryMax;
+ else if (!pos.square_is_empty(move_to(m)))
+ {
+ int seeScore = pos.see(m);
+ moves[i].score = (seeScore >= 0)? seeScore + HistoryMax : seeScore;
+ } else
+ moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
}
}
void MovePicker::score_qcaptures() {
- // Use MVV/LVA ordering.
- for(int i = 0; i < numOfMoves; i++) {
- Move m = moves[i].move;
- if(move_promotion(m))
- moves[i].score = QueenValueMidgame;
- else
- moves[i].score =
- int(pos->midgame_value_of_piece_on(move_to(m))) -
- int(pos->midgame_value_of_piece_on(move_to(m))) / 64;
+
+ // Use MVV/LVA ordering
+ for (int i = 0; i < numOfMoves; i++)
+ {
+ Move m = moves[i].move;
+ if (move_promotion(m))
+ moves[i].score = QueenValueMidgame;
+ else
+ moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
+ -int(pos.type_of_piece_on(move_from(m)));
}
}
+/// find_best_index() loops across the moves and returns index of
+/// the highest scored one.
+
+int MovePicker::find_best_index() const {
+
+ assert(movesPicked < numOfMoves);
+
+ int bestIndex = movesPicked;
+ int bestScore = moves[movesPicked].score;
+
+ for (int i = movesPicked + 1; i < numOfMoves; i++)
+ if (moves[i].score > bestScore)
+ {
+ bestIndex = i;
+ bestScore = moves[i].score;
+ }
+ return bestIndex;
+}
+
+
/// MovePicker::pick_move_from_list() picks the move with the biggest score
/// from a list of generated moves (moves[] or badCaptures[], depending on
/// the current move generation phase). It takes care not to return the
/// transposition table move if that has already been serched previously.
-/// While picking captures in the PH_GOOD_CAPTURES phase (i.e. while picking
-/// non-losing captures in the main search), it moves all captures with
-/// negative SEE values to the badCaptures[] array.
Move MovePicker::pick_move_from_list() {
- int bestScore = -10000000;
+
int bestIndex;
Move move;
- switch(PhaseTable[phaseIndex]) {
+ switch (PhaseTable[phaseIndex]) {
case PH_GOOD_CAPTURES:
- assert(!pos->is_check());
- assert(movesPicked >= 0);
- while(movesPicked < numOfMoves) {
- bestScore = -10000000;
- bestIndex = -1;
- for(int i = movesPicked; i < numOfMoves; i++) {
- if(moves[i].score < 0) {
- // Losing capture, move it to the badCaptures[] array
- assert(numOfBadCaptures < 63);
- badCaptures[numOfBadCaptures++] = moves[i];
- moves[i--] = moves[--numOfMoves];
- }
- else if(moves[i].score > bestScore) {
- bestIndex = i;
- bestScore = moves[i].score;
- }
+ assert(!pos.is_check());
+ assert(movesPicked >= 0);
+
+ while (movesPicked < numOfMoves)
+ {
+ bestIndex = find_best_index();
+ move = moves[bestIndex].move;
+ moves[bestIndex] = moves[movesPicked++];
+ if ( move != ttMove
+ && move != mateKiller
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
}
- if(bestIndex != -1) { // Found a good capture
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- if(move != ttMove && move != mateKiller &&
- pos->move_is_legal(move, pinned))
- return move;
- }
- }
- break;
+ break;
case PH_NONCAPTURES:
- assert(!pos->is_check());
- assert(movesPicked >= 0);
- while(movesPicked < numOfMoves) {
- bestScore = -10000000;
-
- // If this is a PV node or we have only picked a few moves, scan
- // the entire move list for the best move. If many moves have already
- // been searched and it is not a PV node, we are probably failing low
- // anyway, so we just pick the first move from the list.
- if(pvNode || movesPicked < 12) {
- bestIndex = -1;
- for(int i = movesPicked; i < numOfMoves; i++)
- if(moves[i].score > bestScore) {
- bestIndex = i;
- bestScore = moves[i].score;
- }
+ assert(!pos.is_check());
+ assert(movesPicked >= 0);
+
+ while (movesPicked < numOfMoves)
+ {
+ // If this is a PV node or we have only picked a few moves, scan
+ // the entire move list for the best move. If many moves have already
+ // been searched and it is not a PV node, we are probably failing low
+ // anyway, so we just pick the first move from the list.
+ bestIndex = (pvNode || movesPicked < 12) ? find_best_index() : movesPicked;
+ move = moves[bestIndex].move;
+ moves[bestIndex] = moves[movesPicked++];
+ if ( move != ttMove
+ && move != mateKiller
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
}
- else
- bestIndex = movesPicked;
-
- if(bestIndex != -1) {
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- if(move != ttMove && move != mateKiller &&
- pos->move_is_legal(move, pinned))
- return move;
- }
- }
- break;
+ break;
case PH_EVASIONS:
- assert(pos->is_check());
- assert(movesPicked >= 0);
- while(movesPicked < numOfMoves) {
- bestScore = -10000000;
- bestIndex = -1;
- for(int i = movesPicked; i < numOfMoves; i++)
- if(moves[i].score > bestScore) {
- bestIndex = i;
- bestScore = moves[i].score;
- }
-
- if(bestIndex != -1) {
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- return move;
- }
+ assert(pos.is_check());
+ assert(movesPicked >= 0);
+
+ while (movesPicked < numOfMoves)
+ {
+ bestIndex = find_best_index();
+ move = moves[bestIndex].move;
+ moves[bestIndex] = moves[movesPicked++];
+ return move;
}
break;
case PH_BAD_CAPTURES:
- assert(!pos->is_check());
- assert(badCapturesPicked >= 0);
- // It's probably a good idea to use SEE move ordering here, instead
- // of just picking the first move. FIXME
- while(badCapturesPicked < numOfBadCaptures) {
- move = badCaptures[badCapturesPicked++].move;
- if(move != ttMove && move != mateKiller &&
- pos->move_is_legal(move, pinned))
- return move;
- }
- break;
+ assert(!pos.is_check());
+ assert(movesPicked >= 0);
+ // It's probably a good idea to use SEE move ordering here, instead
+ // of just picking the first move. FIXME
+ while (movesPicked < numOfBadCaptures)
+ {
+ move = badCaptures[movesPicked++].move;
+ if ( move != ttMove
+ && move != mateKiller
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
+ }
+ break;
case PH_QCAPTURES:
- assert(!pos->is_check());
- assert(movesPicked >= 0);
- while(movesPicked < numOfMoves) {
- bestScore = -10000000;
- if(movesPicked < 4) {
- bestIndex = -1;
- for(int i = movesPicked; i < numOfMoves; i++)
- if(moves[i].score > bestScore) {
- bestIndex = i;
- bestScore = moves[i].score;
- }
- }
- else
- bestIndex = movesPicked;
-
- if(bestIndex != -1) {
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- // Remember to change the line below if we decide to hash the qsearch!
- // Maybe also postpone the legality check until after futility pruning?
- if(/* move != ttMove && */ pos->move_is_legal(move, pinned))
- return move;
+ assert(!pos.is_check());
+ assert(movesPicked >= 0);
+ while (movesPicked < numOfMoves)
+ {
+ bestIndex = (movesPicked < 4 ? find_best_index() : movesPicked);
+ move = moves[bestIndex].move;
+ moves[bestIndex] = moves[movesPicked++];
+ // Maybe postpone the legality check until after futility pruning?
+ if ( move != ttMove
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
}
- }
- break;
+ break;
case PH_QCHECKS:
- assert(!pos->is_check());
- assert(movesPicked >= 0);
- // Perhaps we should do something better than just picking the first
- // move here? FIXME
- while(movesPicked < numOfMoves) {
- move = moves[movesPicked++].move;
- // Remember to change the line below if we decide to hash the qsearch!
- if(/* move != ttMove && */ pos->move_is_legal(move, pinned))
- return move;
- }
- break;
+ assert(!pos.is_check());
+ assert(movesPicked >= 0);
+ // Perhaps we should do something better than just picking the first
+ // move here? FIXME
+ while (movesPicked < numOfMoves)
+ {
+ move = moves[movesPicked++].move;
+ if ( move != ttMove
+ && pos.pl_move_is_legal(move, pinned))
+ return move;
+ }
+ break;
default:
- break;
+ break;
}
-
return MOVE_NONE;
}
/// MovePicker::init_phase_table() initializes the PhaseTable[],
/// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex
-/// and QsearchWithoutChecksPhaseIndex variables. It is only called once
-/// during program startup, and never again while the program is running.
+/// and QsearchWithoutChecksPhaseIndex. It is only called once during
+/// program startup, and never again while the program is running.
void MovePicker::init_phase_table() {
+
int i = 0;
// Main search
@@ -483,12 +459,14 @@ void MovePicker::init_phase_table() {
// Quiescence search with checks
QsearchWithChecksPhaseIndex = i - 1;
+ PhaseTable[i++] = PH_TT_MOVE;
PhaseTable[i++] = PH_QCAPTURES;
PhaseTable[i++] = PH_QCHECKS;
PhaseTable[i++] = PH_STOP;
// Quiescence search without checks
QsearchWithoutChecksPhaseIndex = i - 1;
+ PhaseTable[i++] = PH_TT_MOVE;
PhaseTable[i++] = PH_QCAPTURES;
PhaseTable[i++] = PH_STOP;
}