Skip to content

Commit

Permalink
Simplify BlockedByKing in pawn storms
Browse files Browse the repository at this point in the history
This patch is non-functional. Current master does four operations to determine
whether an enemy pawn on this file is blocked by the king or not

```
f == file_of(ksq) && rkThem == relative_rank(Us, ksq) + 1 )
```

By adding a direction (based on the template color), this is reduced to two
operations. This works because b is limited to enemy pawns that are ahead of
the king and on the current file.

```
shift<Down>(b) & ksq
```

I've added a line of code, but the number of executing instructions is reduced
(I think). I'm not sure if this counts as a simplification, but it should
theoretically be a little faster (barely). The code line length is also reduced
making it a little easier to read.

Closes official-stockfish#1552

No functional change.
  • Loading branch information
protonspring authored and snicolet committed Apr 18, 2018
1 parent 73e8daa commit f7cc002
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/pawns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ Entry* probe(const Position& pos) {
template<Color Us>
Value Entry::shelter_storm(const Position& pos, Square ksq) {

constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
constexpr Direction Down = (Us == WHITE ? SOUTH : NORTH);

enum { BlockedByKing, Unopposed, BlockedByPawn, Unblocked };

Expand All @@ -257,9 +258,9 @@ Value Entry::shelter_storm(const Position& pos, Square ksq) {
int d = std::min(f, ~f);
safety -= ShelterWeakness[f == file_of(ksq)][d][rkUs]
+ StormDanger
[f == file_of(ksq) && rkThem == relative_rank(Us, ksq) + 1 ? BlockedByKing :
rkUs == RANK_1 ? Unopposed :
rkThem == rkUs + 1 ? BlockedByPawn : Unblocked]
[(shift<Down>(b) & ksq) ? BlockedByKing :
rkUs == RANK_1 ? Unopposed :
rkThem == (rkUs + 1) ? BlockedByPawn : Unblocked]
[d][rkThem];
}

Expand Down

0 comments on commit f7cc002

Please sign in to comment.