From: Fabian Fichter Date: Thu, 11 Feb 2021 22:29:23 +0000 (+0100) Subject: Merge official-stockfish/master X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=41635de581886e2ff6cf9e36bfc4d770f2758770;p=fairystockfish.git Merge official-stockfish/master bench: 4387592 --- 41635de581886e2ff6cf9e36bfc4d770f2758770 diff --cc src/movepick.cpp index c42a813,f5b2749..a90a518 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@@ -109,10 -105,10 +109,10 @@@ void MovePicker::score() else if (Type == QUIETS) m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - + 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)] - + (*continuationHistory[1])[pos.moved_piece(m)][to_sq(m)] - + (*continuationHistory[3])[pos.moved_piece(m)][to_sq(m)] - + (*continuationHistory[5])[pos.moved_piece(m)][to_sq(m)] + + 2 * (*continuationHistory[0])[history_slot(pos.moved_piece(m))][to_sq(m)] - + 2 * (*continuationHistory[1])[history_slot(pos.moved_piece(m))][to_sq(m)] - + 2 * (*continuationHistory[3])[history_slot(pos.moved_piece(m))][to_sq(m)] ++ + (*continuationHistory[1])[history_slot(pos.moved_piece(m))][to_sq(m)] ++ + (*continuationHistory[3])[history_slot(pos.moved_piece(m))][to_sq(m)] + + (*continuationHistory[5])[history_slot(pos.moved_piece(m))][to_sq(m)] + (ply < MAX_LPH ? std::min(4, depth / 3) * (*lowPlyHistory)[ply][from_to(m)] : 0); else // Type == EVASIONS @@@ -121,8 -117,8 +121,8 @@@ m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(type_of(pos.moved_piece(m))); else - m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - + (*continuationHistory[0])[history_slot(pos.moved_piece(m))][to_sq(m)] + m.value = (*mainHistory)[pos.side_to_move()][from_to(m)] - + 2 * (*continuationHistory[0])[pos.moved_piece(m)][to_sq(m)] ++ + 2 * (*continuationHistory[0])[history_slot(pos.moved_piece(m))][to_sq(m)] - (1 << 28); } }