X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=c52384947a6381008b661b5d70d5c8496ea34f9b;hp=0859d772993200007c960cb8198dfae7ac7cfc26;hb=04be84e0e296d0829aa838c512fc95bf495ce629;hpb=a273b6ef8c899f546cf585ace584a1b498c04144 diff --git a/src/movepick.cpp b/src/movepick.cpp index 0859d772..c5238494 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -68,8 +68,10 @@ namespace { /// ordering is at the current node. MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, - const CounterMoveStats& cmh, const CounterMoveStats& fmh, Move cm, Search::Stack* s) - : pos(p), history(h), counterMoveHistory(&cmh), followupMoveHistory(&fmh), ss(s), countermove(cm), depth(d) { + const CounterMoveStats& cmh, const CounterMoveStats& fmh, + Move cm, Search::Stack* s) + : pos(p), history(h), counterMoveHistory(&cmh), + followupMoveHistory(&fmh), ss(s), countermove(cm), depth(d) { assert(d > DEPTH_ZERO); @@ -80,7 +82,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, Square s) - : pos(p), history(h), counterMoveHistory(nullptr), followupMoveHistory(nullptr) { + : pos(p), history(h) { assert(d <= DEPTH_ZERO); @@ -105,7 +107,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, } MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Value th) - : pos(p), history(h), counterMoveHistory(nullptr), followupMoveHistory(nullptr), threshold(th) { + : pos(p), history(h), threshold(th) { assert(!pos.checkers()); @@ -142,7 +144,7 @@ void MovePicker::score() { for (auto& m : *this) m.value = history[pos.moved_piece(m)][to_sq(m)] - + (*counterMoveHistory)[pos.moved_piece(m)][to_sq(m)] + + (*counterMoveHistory )[pos.moved_piece(m)][to_sq(m)] + (*followupMoveHistory)[pos.moved_piece(m)][to_sq(m)]; }