//// Includes
////
+#include <algorithm>
#include <cassert>
#include "history.h"
case PH_GOOD_CAPTURES:
numOfMoves = generate_captures(pos, moves);
score_captures();
+ std::sort(moves, moves + numOfMoves);
movesPicked = 0;
break;
case PH_BAD_CAPTURES:
+ // It's probably a good idea to use SEE move ordering here. FIXME
movesPicked = 0;
break;
case PH_NONCAPTURES:
numOfMoves = generate_noncaptures(pos, moves);
score_noncaptures();
+ std::sort(moves, moves + numOfMoves);
movesPicked = 0;
break;
assert(pos.is_check());
numOfMoves = generate_evasions(pos, moves, pinned);
score_evasions();
+ std::sort(moves, moves + numOfMoves);
movesPicked = 0;
break;
case PH_QCAPTURES:
numOfMoves = generate_captures(pos, moves);
score_qcaptures();
+ std::sort(moves, moves + numOfMoves);
movesPicked = 0;
break;
case PH_QCHECKS:
- numOfMoves = generate_checks(pos, moves, dc);
+ // Perhaps we should order moves move here? FIXME
+ numOfMoves = generate_non_capture_checks(pos, moves, dc);
movesPicked = 0;
break;
}
-/// 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
Move MovePicker::pick_move_from_list() {
- int bestIndex;
- Move move;
+ assert(movesPicked >= 0);
+ assert(!pos.is_check() || PhaseTable[phaseIndex] == PH_EVASIONS || PhaseTable[phaseIndex] == PH_STOP);
+ assert( pos.is_check() || PhaseTable[phaseIndex] != PH_EVASIONS);
switch (PhaseTable[phaseIndex]) {
case PH_GOOD_CAPTURES:
- 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;
- }
- break;
-
case PH_NONCAPTURES:
- 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++];
+ Move move = moves[movesPicked++].move;
if ( move != ttMove
&& move != mateKiller
&& pos.pl_move_is_legal(move, pinned))
break;
case PH_EVASIONS:
- assert(pos.is_check());
- assert(movesPicked >= 0);
+ if (movesPicked < numOfMoves)
+ return moves[movesPicked++].move;
- while (movesPicked < numOfMoves)
- {
- bestIndex = find_best_index();
- move = moves[bestIndex].move;
- moves[bestIndex] = moves[movesPicked++];
- return move;
- }
- break;
+ break;
case PH_BAD_CAPTURES:
- 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;
+ Move move = badCaptures[movesPicked++].move;
if ( move != ttMove
&& move != mateKiller
&& pos.pl_move_is_legal(move, pinned))
break;
case PH_QCAPTURES:
- 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;
-
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;
+ Move move = moves[movesPicked++].move;
+ // Maybe postpone the legality check until after futility pruning?
if ( move != ttMove
&& pos.pl_move_is_legal(move, pinned))
return move;