Assorted trivial cleanups 3/2019 (#2030)

No functional change.
This commit is contained in:
Marco Costalba
2019-03-31 11:47:36 +02:00
committed by GitHub
parent 95ba7f78d5
commit 82ad9ce9cf
9 changed files with 34 additions and 39 deletions

View File

@@ -76,10 +76,7 @@ namespace {
if (file_of(pos.square<PAWN>(strongSide)) >= FILE_E)
sq = Square(sq ^ 7); // Mirror SQ_H1 -> SQ_A1
if (strongSide == BLACK)
sq = ~sq;
return sq;
return strongSide == WHITE ? sq : ~sq;
}
} // namespace
@@ -285,18 +282,18 @@ Value Endgame<KQKR>::operator()(const Position& pos) const {
}
/// KNN vs KP. Simply push the opposing king to the corner.
/// KNN vs KP. Simply push the opposing king to the corner
template<>
Value Endgame<KNNKP>::operator()(const Position& pos) const {
assert(verify_material(pos, strongSide, 2 * KnightValueMg, 0));
assert(verify_material(pos, weakSide, VALUE_ZERO, 1));
assert(verify_material(pos, strongSide, 2 * KnightValueMg, 0));
assert(verify_material(pos, weakSide, VALUE_ZERO, 1));
Value result = 2 * KnightValueEg
- PawnValueEg
+ PushToEdges[pos.square<KING>(weakSide)];
Value result = 2 * KnightValueEg
- PawnValueEg
+ PushToEdges[pos.square<KING>(weakSide)];
return strongSide == pos.side_to_move() ? result : -result;
return strongSide == pos.side_to_move() ? result : -result;
}