X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=afea0fa4d5d720949d591f7c4b663546aff9722c;hp=08dabe0a1eedb51af077cef8677da3a3a5938b2a;hb=34e47ca87d82a420043f2bc9a1960eb1fad5c4f4;hpb=e0504ab876a997321102f040ab88203cb893db12 diff --git a/src/movepick.cpp b/src/movepick.cpp index 08dabe0a..afea0fa4 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -140,7 +140,7 @@ void MovePicker::score() { template<> void MovePicker::score() { - const FromToStats& fromTo = pos.this_thread()->fromTo; + const HistoryStats& history = pos.this_thread()->history; const CounterMoveStats* cmh = (ss-1)->counterMoves; const CounterMoveStats* fmh = (ss-2)->counterMoves; @@ -152,21 +152,21 @@ void MovePicker::score() { m.value = (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); + + history.get(c, m); } template<> void MovePicker::score() { // Try captures ordered by MVV/LVA, then non-captures ordered by stats heuristics - const FromToStats& fromTo = pos.this_thread()->fromTo; + const HistoryStats& history = pos.this_thread()->history; Color c = pos.side_to_move(); for (auto& m : *this) if (pos.capture(m)) m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(type_of(pos.moved_piece(m))) + FromToStats::Max; + - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max; else - m.value = fromTo.get(c, m); + m.value = history.get(c, m); }