From 519b2fe849760d3cab5cce9ef9dc3cd076bd300d Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 31 Jan 2015 20:13:38 +0100 Subject: [PATCH 1/1] More readable score() No functional change. --- src/movepick.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/movepick.cpp b/src/movepick.cpp index d6cd4e23..44ce2912 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -148,11 +148,15 @@ void MovePicker::score() { // has been picked up in pick_move_from_list(). This way we save some SEE // calls in case we get a cutoff. for (auto& m : *this) - m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - - Value(type_of(pos.moved_piece(m))) - + (type_of(m) == ENPASSANT ? PieceValue[MG][PAWN] : - type_of(m) == PROMOTION ? PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN] - : VALUE_ZERO); + if (type_of(m) == ENPASSANT) + m.value = PieceValue[MG][PAWN] - Value(PAWN); + + else if (type_of(m) == PROMOTION) + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] - Value(PAWN) + + PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN]; + else + m.value = PieceValue[MG][pos.piece_on(to_sq(m))] + - Value(type_of(pos.moved_piece(m))); } template<> -- 2.39.2