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;
}
+
////
//// Functions
////
}
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);
+
+ bool all_zero = true;
+ for (int i = 0; i < numOfMoves; i++)
+ {
+ Move m = moves[i].move;
+ if (m == killer1)
+ {
+ moves[i].score = HistoryMax + 2;
+ all_zero = false;
+ }
+ else if (m == killer2)
+ {
+ moves[i].score = HistoryMax + 1;
+ all_zero = false;
+ }
+ else
+ {
+ moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m);
+ if (all_zero && moves[i].score != 0)
+ all_zero = false;
+ }
}
+ if (!all_zero)
+ return;
+
+ // If we don't have at least one history score then
+ // try to order using psq tables difference between
+ // from square and to square.
+ for (int i = 0; i < numOfMoves; i++)
+ moves[i].score = pos->mg_pst_delta(moves[i].move);
}
void MovePicker::score_evasions() {
}
}
if(bestIndex != -1) { // Found a good capture
- MoveStack tmp = moves[movesPicked];
- moves[movesPicked] = moves[bestIndex];
- moves[bestIndex] = tmp;
- move = moves[movesPicked++].move;
+ move = moves[bestIndex].move;\r
+ moves[bestIndex] = moves[movesPicked++];
if(move != ttMove && move != mateKiller &&
pos->move_is_legal(move, pinned))
return move;
bestIndex = movesPicked;
if(bestIndex != -1) {
- MoveStack tmp = moves[movesPicked];
- moves[movesPicked] = moves[bestIndex];
- moves[bestIndex] = tmp;
- move = moves[movesPicked++].move;
+ move = moves[bestIndex].move;\r
+ moves[bestIndex] = moves[movesPicked++];
if(move != ttMove && move != mateKiller &&
pos->move_is_legal(move, pinned))
return move;
}
if(bestIndex != -1) {
- MoveStack tmp = moves[movesPicked];
- moves[movesPicked] = moves[bestIndex];
- moves[bestIndex] = tmp;
- move = moves[movesPicked++].move;
+ move = moves[bestIndex].move;\r
+ moves[bestIndex] = moves[movesPicked++];
return move;
}
}
bestIndex = movesPicked;
if(bestIndex != -1) {
- MoveStack tmp = moves[movesPicked];
- moves[movesPicked] = moves[bestIndex];
- moves[bestIndex] = tmp;
-
- move = moves[movesPicked++].move;
+ move = moves[bestIndex].move;\r
+ 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_NONE;
}
+MovePicker::MovegenPhase MovePicker::current_move_type() const {
+ return PhaseTable[phaseIndex];
+}
/// MovePicker::init_phase_table() initializes the PhaseTable[],
/// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex