kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Use C++11 loops in MovePicker

Browse source 
No functional change.
This commit is contained in:
Marco Costalba 2015-01-31 19:53:19 +01:00
parent 65f46794af
commit f3189bdc9a
2 changed files with 42 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/movepick.cpp
View file

@ -71,7 +71,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
assert(d > DEPTH_ZERO); assert(d > DEPTH_ZERO);
cur = end = moves;
endBadCaptures = moves + MAX_MOVES - 1; endBadCaptures = moves + MAX_MOVES - 1;
countermoves = cm; countermoves = cm;
followupmoves = fm; followupmoves = fm;
@ -84,11 +83,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
stage = MAIN_SEARCH; stage = MAIN_SEARCH;
ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
end += (ttMove != MOVE_NONE); endMoves += (ttMove != MOVE_NONE);
} }
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
Square s) : pos(p), history(h), cur(moves), end(moves) { Square s) : pos(p), history(h) {
assert(d <= DEPTH_ZERO); assert(d <= DEPTH_ZERO);
@ -109,11 +108,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
} }
ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE); ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
end += (ttMove != MOVE_NONE); endMoves += (ttMove != MOVE_NONE);
} }
MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt) MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
: pos(p), history(h), cur(moves), end(moves) { : pos(p), history(h) {
assert(!pos.checkers()); assert(!pos.checkers());
@ -127,7 +126,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold)) if (ttMove && (!pos.capture(ttMove) || pos.see(ttMove) <= captureThreshold))
ttMove = MOVE_NONE; ttMove = MOVE_NONE;
end += (ttMove != MOVE_NONE); endMoves += (ttMove != MOVE_NONE);
} }
@ -148,32 +147,18 @@ void MovePicker::score<CAPTURES>() {
// badCaptures[] array, but instead of doing it now we delay until the move // badCaptures[] array, but instead of doing it now we delay until the move
// has been picked up in pick_move_from_list(). This way we save some SEE // has been picked up in pick_move_from_list(). This way we save some SEE
// calls in case we get a cutoff. // calls in case we get a cutoff.
Move m; for (auto& m : *this)
m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
for (ExtMove* it = moves; it != end; ++it) - Value(type_of(pos.moved_piece(m)))
{ + (type_of(m) == ENPASSANT ? PieceValue[MG][PAWN] :
m = it->move; type_of(m) == PROMOTION ? PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]
it->value = PieceValue[MG][pos.piece_on(to_sq(m))] : VALUE_ZERO);
- Value(type_of(pos.moved_piece(m)));
if (type_of(m) == ENPASSANT)
it->value += PieceValue[MG][PAWN];
else if (type_of(m) == PROMOTION)
it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
}
} }
template<> template<>
void MovePicker::score<QUIETS>() { void MovePicker::score<QUIETS>() {
for (auto& m : *this)
Move m; m.value = history[pos.moved_piece(m)][to_sq(m)];
for (ExtMove* it = moves; it != end; ++it)
{
m = it->move;
it->value = history[pos.moved_piece(m)][to_sq(m)];
}
} }
template<> template<>
@ -181,21 +166,17 @@ void MovePicker::score<EVASIONS>() {
// Try good captures ordered by MVV/LVA, then non-captures if destination square // Try good captures ordered by MVV/LVA, then non-captures if destination square
// is not under attack, ordered by history value, then bad-captures and quiet // is not under attack, ordered by history value, then bad-captures and quiet
// moves with a negative SEE. This last group is ordered by the SEE value. // moves with a negative SEE. This last group is ordered by the SEE value.
Move m;
Value see; Value see;
for (ExtMove* it = moves; it != end; ++it) for (auto& m : *this)
{
m = it->move;
if ((see = pos.see_sign(m)) < VALUE_ZERO) if ((see = pos.see_sign(m)) < VALUE_ZERO)
it->value = see - HistoryStats::Max; // At the bottom m.value = see - HistoryStats::Max; // At the bottom
else if (pos.capture(m)) else if (pos.capture(m))
it->value = PieceValue[MG][pos.piece_on(to_sq(m))] m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else else
it->value = history[pos.moved_piece(m)][to_sq(m)]; m.value = history[pos.moved_piece(m)][to_sq(m)];
}
} }
@ -209,13 +190,13 @@ void MovePicker::generate_next_stage() {
switch (++stage) { switch (++stage) {
case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6: case CAPTURES_S1: case CAPTURES_S3: case CAPTURES_S4: case CAPTURES_S5: case CAPTURES_S6:
end = generate<CAPTURES>(pos, moves); endMoves = generate<CAPTURES>(pos, moves);
score<CAPTURES>(); score<CAPTURES>();
return; return;
case KILLERS_S1: case KILLERS_S1:
cur = killers; cur = killers;
end = cur + 2; endMoves = cur + 2;
killers[0].move = ss->killers[0]; killers[0].move = ss->killers[0];
killers[1].move = ss->killers[1]; killers[1].move = ss->killers[1];
@ -229,7 +210,7 @@ void MovePicker::generate_next_stage() {
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
if ( countermoves[i] != (cur+0)->move if ( countermoves[i] != (cur+0)->move
&& countermoves[i] != (cur+1)->move) && countermoves[i] != (cur+1)->move)
(end++)->move = countermoves[i]; (endMoves++)->move = countermoves[i];
// Be sure followupmoves are different from killers and countermoves // Be sure followupmoves are different from killers and countermoves
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
@ -237,37 +218,37 @@ void MovePicker::generate_next_stage() {
&& followupmoves[i] != (cur+1)->move && followupmoves[i] != (cur+1)->move
&& followupmoves[i] != (cur+2)->move && followupmoves[i] != (cur+2)->move
&& followupmoves[i] != (cur+3)->move) && followupmoves[i] != (cur+3)->move)
(end++)->move = followupmoves[i]; (endMoves++)->move = followupmoves[i];
return; return;
case QUIETS_1_S1: case QUIETS_1_S1:
endQuiets = end = generate<QUIETS>(pos, moves); endQuiets = endMoves = generate<QUIETS>(pos, moves);
score<QUIETS>(); score<QUIETS>();
end = std::partition(cur, end, [](const ExtMove& m) { return m.value > VALUE_ZERO; }); endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
insertion_sort(cur, end); insertion_sort(cur, endMoves);
return; return;
case QUIETS_2_S1: case QUIETS_2_S1:
cur = end; cur = endMoves;
end = endQuiets; endMoves = endQuiets;
if (depth >= 3 * ONE_PLY) if (depth >= 3 * ONE_PLY)
insertion_sort(cur, end); insertion_sort(cur, endMoves);
return; return;
case BAD_CAPTURES_S1: case BAD_CAPTURES_S1:
// Just pick them in reverse order to get MVV/LVA ordering // Just pick them in reverse order to get MVV/LVA ordering
cur = moves + MAX_MOVES - 1; cur = moves + MAX_MOVES - 1;
end = endBadCaptures; endMoves = endBadCaptures;
return; return;
case EVASIONS_S2: case EVASIONS_S2:
end = generate<EVASIONS>(pos, moves); endMoves = generate<EVASIONS>(pos, moves);
if (end > moves + 1) if (endMoves > moves + 1)
score<EVASIONS>(); score<EVASIONS>();
return; return;
case QUIET_CHECKS_S3: case QUIET_CHECKS_S3:
end = generate<QUIET_CHECKS>(pos, moves); endMoves = generate<QUIET_CHECKS>(pos, moves);
return; return;
case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
@ -275,7 +256,7 @@ void MovePicker::generate_next_stage() {
/* Fall through */ /* Fall through */
case STOP: case STOP:
end = cur + 1; // Avoid another next_phase() call endMoves = cur + 1; // Avoid another next_phase() call
return; return;
default: default:
@ -295,7 +276,7 @@ Move MovePicker::next_move<false>() {
while (true) while (true)
{ {
while (cur == end) while (cur == endMoves)
generate_next_stage(); generate_next_stage();
switch (stage) { switch (stage) {
@ -305,7 +286,7 @@ Move MovePicker::next_move<false>() {
return ttMove; return ttMove;
case CAPTURES_S1: case CAPTURES_S1:
move = pick_best(cur++, end)->move; move = pick_best(cur++, endMoves)->move;
if (move != ttMove) if (move != ttMove)
{ {
if (pos.see_sign(move) >= VALUE_ZERO) if (pos.see_sign(move) >= VALUE_ZERO)
@ -341,19 +322,19 @@ Move MovePicker::next_move<false>() {
return (cur--)->move; return (cur--)->move;
case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4: case EVASIONS_S2: case CAPTURES_S3: case CAPTURES_S4:
move = pick_best(cur++, end)->move; move = pick_best(cur++, endMoves)->move;
if (move != ttMove) if (move != ttMove)
return move; return move;
break; break;
case CAPTURES_S5: case CAPTURES_S5:
move = pick_best(cur++, end)->move; move = pick_best(cur++, endMoves)->move;
if (move != ttMove && pos.see(move) > captureThreshold) if (move != ttMove && pos.see(move) > captureThreshold)
return move; return move;
break; break;
case CAPTURES_S6: case CAPTURES_S6:
move = pick_best(cur++, end)->move; move = pick_best(cur++, endMoves)->move;
if (to_sq(move) == recaptureSquare) if (to_sq(move) == recaptureSquare)
return move; return move;
break; break;

6
src/movepick.h
View file

@ -93,6 +93,8 @@ public:
private: private:
template<GenType> void score(); template<GenType> void score();
void generate_next_stage(); void generate_next_stage();
ExtMove* begin() { return moves; }
ExtMove* end() { return endMoves; }
const Position& pos; const Position& pos;
const HistoryStats& history; const HistoryStats& history;
@ -105,8 +107,8 @@ private:
Square recaptureSquare; Square recaptureSquare;
Value captureThreshold; Value captureThreshold;
int stage; int stage;
ExtMove *cur, *end, *endQuiets, *endBadCaptures; ExtMove *endQuiets, *endBadCaptures;
ExtMove moves[MAX_MOVES]; ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
}; };
#endif // #ifndef MOVEPICK_H_INCLUDED #endif // #ifndef MOVEPICK_H_INCLUDED