Skip to content

Simplified and tidied up file-to-queenside file mapping #2325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nickpelling wants to merge 6 commits into from
Closed

Simplified and tidied up file-to-queenside file mapping #2325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbd8aee
Simplified / de-obfuscated file to half-file conversion
nickpelling Sep 21, 2019
c9df389
Avoided multiply in file_to_halffile()
nickpelling Sep 21, 2019
9e27b56
Used godbolt to find better opcode sequence
nickpelling Sep 21, 2019
5693a74
Added missing header
nickpelling Sep 23, 2019
8428184
Merge branch 'master' into halffile
nickpelling Sep 23, 2019
8f78e03
Added missing header to this branch
nickpelling Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/evaluate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ namespace {
|| (pos.pieces(PAWN) & (s + Up)))
bonus = bonus / 2;

score += bonus - PassedFile * std::min(f, ~f);
score += bonus - PassedFile * map_to_queenside(f);
}

if (T)
Expand Down
2 changes: 1 addition & 1 deletion src/pawns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Score Entry::evaluate_shelter(const Position& pos, Square ksq) {
b = theirPawns & file_bb(f);
int theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : 0;

int d = std::min(f, ~f);
File d = map_to_queenside(f);
bonus += make_score(ShelterStrength[d][ourRank], 0);

if (ourRank && (ourRank == theirRank - 1))
Expand Down
2 changes: 1 addition & 1 deletion src/psqt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void init() {

for (Square s = SQ_A1; s <= SQ_H8; ++s)
{
File f = std::min(file_of(s), ~file_of(s));
File f = map_to_queenside(file_of(s));
psq[ pc][ s] = score + (type_of(pc) == PAWN ? PBonus[rank_of(s)][file_of(s)]
: Bonus[pc][rank_of(s)][f]);
psq[~pc][~s] = -psq[pc][s];
Expand Down
6 changes: 4 additions & 2 deletions src/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <climits>
#include <cstdint>
#include <cstdlib>
#include <algorithm>

#if defined(_MSC_VER)
// Disable some silly and noisy warning from MSVC compiler
Expand Down Expand Up @@ -358,8 +359,8 @@ constexpr Square operator~(Square s) {
return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8
}

constexpr File operator~(File f) {
return File(f ^ FILE_H); // Horizontal flip FILE_A -> FILE_H
inline File map_to_queenside(File f) {
return std::min(f, File(FILE_H - f)); // Maps File ABCDEFGH to File ABCDDCBA
}

constexpr Piece operator~(Piece pc) {
Expand Down Expand Up @@ -461,3 +462,4 @@ constexpr bool is_ok(Move m) {
}

#endif // #ifndef TYPES_H_INCLUDED