HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 17:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge some conditions

Browse Source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
homoSapiensSapiens
2013-05-03 14:01:41 +03:00
committed by Marco Costalba
parent 3b41e62666
commit e00bb13e85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/evaluate.cpp
View File

@@ -651,19 +651,19 @@ Value do_evaluate(const Position& pos, Value& margin) {
if ( file_of(ksq) >= FILE_E if ( file_of(ksq) >= FILE_E
&& file_of(s) > file_of(ksq) && file_of(s) > file_of(ksq)
&& (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))) && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
&& !ei.pi->has_open_file_to_right(Us, file_of(ksq)))
{ {
// Is there a half-open file between the king and the edge of the board? // Is there a half-open file between the king and the edge of the board?
if (!ei.pi->has_open_file_to_right(Us, file_of(ksq)))
score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
: (TrappedRookPenalty - mob * 16), 0); : (TrappedRookPenalty - mob * 16), 0);
} }
else if ( file_of(ksq) <= FILE_D else if ( file_of(ksq) <= FILE_D
&& file_of(s) < file_of(ksq) && file_of(s) < file_of(ksq)
&& (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))) && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
&& !ei.pi->has_open_file_to_left(Us, file_of(ksq)))
{ {
// Is there a half-open file between the king and the edge of the board? // Is there a half-open file between the king and the edge of the board?
if (!ei.pi->has_open_file_to_left(Us, file_of(ksq)))
score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
: (TrappedRookPenalty - mob * 16), 0); : (TrappedRookPenalty - mob * 16), 0);
} }