#include <cassert>
#include "history.h"
+#include "evaluate.h"
#include "movegen.h"
#include "movepick.h"
#include "search.h"
int MainSearchPhaseIndex;
int EvasionsPhaseIndex;
int QsearchWithChecksPhaseIndex;
+ int QsearchNoCapturesPhaseIndex;
int QsearchWithoutChecksPhaseIndex;
+ int NoMovesPhaseIndex;
}
/// search captures, promotions and some checks) and about how important good
/// move ordering is at the current node.
-MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk,
- Move k1, Move k2, Depth d) : pos(p) {
- pvNode = pvnode;
+MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
+ const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) {
+ pvNode = pv;
ttMove = ttm;
- mateKiller = (mk == ttm)? MOVE_NONE : mk;
- killer1 = k1;
- killer2 = k2;
+ 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());
+
+ // With EvalInfo we are able to know how many captures are possible before
+ // generating them. So avoid generating in case we know are zero.
+ Color us = pos.side_to_move();
+ Color them = opposite_color(us);
+ bool noCaptures = ei
+ && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0
+ && !ei->mi->specialized_eval_exists()
+ && (pos.ep_square() == SQ_NONE)
+ && !pos.has_pawn_on_7th(us);
if (p.is_check())
- phaseIndex = EvasionsPhaseIndex;
+ phaseIndex = EvasionsPhaseIndex;
else if (depth > Depth(0))
- phaseIndex = MainSearchPhaseIndex;
+ phaseIndex = MainSearchPhaseIndex;
else if (depth == Depth(0))
- phaseIndex = QsearchWithChecksPhaseIndex;
+ phaseIndex = (noCaptures ? QsearchNoCapturesPhaseIndex : QsearchWithChecksPhaseIndex);
else
- phaseIndex = QsearchWithoutChecksPhaseIndex;
+ phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
+ dc = p.discovered_check_candidates(us);
pinned = p.pinned_pieces(p.side_to_move());
finished = false;
case PH_GOOD_CAPTURES:
numOfMoves = generate_captures(pos, moves);
score_captures();
- capSquares = EmptyBoardBB;
movesPicked = 0;
break;
// 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.
+ // While scoring captures it moves all captures with negative SEE values
+ // to the badCaptures[] array.
Move m;
int seeValue;
else
moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m)))
-int(pos.type_of_piece_on(move_from(m)));
- } else
+ }
+ else
+ {
+ // Losing capture, move it to the badCaptures[] array
+ assert(numOfBadCaptures < 63);
moves[i].score = seeValue;
+ badCaptures[numOfBadCaptures++] = moves[i];
+ moves[i--] = moves[--numOfMoves];
+ }
}
}
else
hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
- // Ensure moves in history are always sorted as first
+ // Ensure history is always preferred to pst
if (hs > 0)
hs += 1000;
+ // pst based scoring
moves[i].score = hs + pos.mg_pst_delta(m);
}
}
} else
moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
}
- // FIXME try psqt also here
}
void MovePicker::score_qcaptures() {
/// 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() {
while (movesPicked < numOfMoves)
{
- int 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;
- }
- }
+ bestIndex = find_best_index();
+
if (bestIndex != -1) // Found a good capture
{
move = moves[bestIndex].move;
/// 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.
+/// QsearchNoCapturesPhaseIndex, QsearchWithoutChecksPhaseIndex and
+/// NoMovesPhaseIndex variables. It is only called once during program
+/// startup, and never again while the program is running.
void MovePicker::init_phase_table() {
PhaseTable[i++] = PH_QCHECKS;
PhaseTable[i++] = PH_STOP;
+ // Quiescence search with checks only and no captures
+ QsearchNoCapturesPhaseIndex = i - 1;
+ PhaseTable[i++] = PH_QCHECKS;
+ PhaseTable[i++] = PH_STOP;
+
// Quiescence search without checks
QsearchWithoutChecksPhaseIndex = i - 1;
PhaseTable[i++] = PH_QCAPTURES;
PhaseTable[i++] = PH_STOP;
+
+ // Do not generate any move
+ NoMovesPhaseIndex = i - 1;
+ PhaseTable[i++] = PH_STOP;
}