X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=34d295626b80732930dfbf2100ada837d475530f;hp=abb753baea75d118ae41cfecefdf38992050227d;hb=6b16ebc82566a69b9336cca6aa7a19ab1824b85d;hpb=e3a8b8bcff893d078e219637b3d0dcaeaa04beb2 diff --git a/src/movepick.cpp b/src/movepick.cpp index abb753ba..34d29562 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -143,17 +143,17 @@ void MovePicker::score() { const HistoryStats& history = pos.this_thread()->history; const FromToStats& fromTo = pos.this_thread()->fromTo; - const CounterMoveStats* cm = (ss-1)->counterMoves; - const CounterMoveStats* fm = (ss-2)->counterMoves; - const CounterMoveStats* f2 = (ss-4)->counterMoves; + const CounterMoveStats* cmh = (ss-1)->counterMoves; + const CounterMoveStats* fmh = (ss-2)->counterMoves; + const CounterMoveStats* fmh2 = (ss-4)->counterMoves; Color c = pos.side_to_move(); for (auto& m : *this) - m.value = history[pos.moved_piece(m)][to_sq(m)] - + (cm ? (*cm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) - + (fm ? (*fm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) - + (f2 ? (*f2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + m.value = history[pos.moved_piece(m)][to_sq(m)] + + (cmh ? (*cmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + + (fmh ? (*fmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + + (fmh2 ? (*fmh2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO) + fromTo.get(c, m); }