From 1a3449676182bba94ac3995c0f56781199db17eb Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Wed, 15 May 2013 00:06:11 +0200 Subject: [PATCH] Revert trapped rook bug fix It seems that do not limiting checking the trapped rook only on rank 1 improves the score. At long TC LLR: 2.97 (-2.94,2.94) Total: 6581 W: 1346 L: 1204 D: 4031 bench: 4985012 --- src/evaluate.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 6b590c78..607694e0 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -600,8 +600,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // Penalize rooks which are trapped inside a king. Penalize more if // king has lost right to castle. if ( ((file_of(ksq) < FILE_E) == (file_of(s) < file_of(ksq))) - && rank_of(ksq) == rank_of(s) - && relative_rank(Us, ksq) == RANK_1 + && (rank_of(ksq) == rank_of(s) || relative_rank(Us, ksq) == RANK_1) && !ei.pi->half_open_on_side(Us, file_of(ksq), file_of(ksq) < FILE_E)) score -= (TrappedRookPenalty - make_score(mob * 8, 0)) * (pos.can_castle(Us) ? 1 : 2); } -- 2.39.2