kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Small simplifications in square.h

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-02-23 09:43:47 +01:00
parent b3108547de
commit aa40d0a917
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/endgame.cpp
View file

@ -402,7 +402,7 @@ ScaleFactor ScalingFunction<KBPsK>::apply(const Position& pos) const {
Square kingSq = pos.king_square(weakerSide); Square kingSq = pos.king_square(weakerSide);
if ( opposite_color_squares(queeningSq, bishopSq) if ( opposite_color_squares(queeningSq, bishopSq)
&& file_distance(square_file(kingSq), pawnFile) <= 1) && abs(square_file(kingSq) - pawnFile) <= 1)
{ {
// The bishop has the wrong color, and the defending king is on the // The bishop has the wrong color, and the defending king is on the
// file of the pawn(s) or the neighboring file. Find the rank of the // file of the pawn(s) or the neighboring file. Find the rank of the
@ -769,7 +769,7 @@ ScaleFactor ScalingFunction<KBPPKB>::apply(const Position& pos) const {
&& opposite_color_squares(ksq, wbsq) && opposite_color_squares(ksq, wbsq)
&& ( bbsq == blockSq2 && ( bbsq == blockSq2
|| (pos.attacks_from<BISHOP>(blockSq2) & pos.pieces(BISHOP, weakerSide)) || (pos.attacks_from<BISHOP>(blockSq2) & pos.pieces(BISHOP, weakerSide))
|| rank_distance(r1, r2) >= 2)) || abs(r1 - r2) >= 2))
return SCALE_FACTOR_ZERO; return SCALE_FACTOR_ZERO;
else if ( ksq == blockSq2 else if ( ksq == blockSq2

20
src/square.h
View file

@ -72,7 +72,7 @@ inline Square operator- (Square x, SquareDelta i) { return x - Square(i); }
inline void operator-= (Square& x, SquareDelta i) { x = x - Square(i); } inline void operator-= (Square& x, SquareDelta i) { x = x - Square(i); }
inline Square make_square(File f, Rank r) { inline Square make_square(File f, Rank r) {
return Square(int(f) | (int(r) << 3)); return Square((int(r) << 3) | int(f));
} }
inline File square_file(Square s) { inline File square_file(Square s) {
@ -104,7 +104,7 @@ inline Rank relative_rank(Color c, Square s) {
} }
inline SquareColor square_color(Square s) { inline SquareColor square_color(Square s) {
return SquareColor((int(square_file(s)) + int(square_rank(s))) & 1); return SquareColor(int(square_rank(s) + s) & 1);
} }
inline bool opposite_color_squares(Square s1, Square s2) { inline bool opposite_color_squares(Square s1, Square s2) {
@ -112,20 +112,12 @@ inline bool opposite_color_squares(Square s1, Square s2) {
return ((s >> 3) ^ s) & 1; return ((s >> 3) ^ s) & 1;
} }
inline int file_distance(File f1, File f2) {
return abs(int(f1) - int(f2));
}
inline int file_distance(Square s1, Square s2) { inline int file_distance(Square s1, Square s2) {
return file_distance(square_file(s1), square_file(s2)); return abs(square_file(s1) - square_file(s2));
}
inline int rank_distance(Rank r1, Rank r2) {
return abs(int(r1) - int(r2));
} }
inline int rank_distance(Square s1, Square s2) { inline int rank_distance(Square s1, Square s2) {
return rank_distance(square_rank(s1), square_rank(s2)); return abs(square_rank(s1) - square_rank(s2));
} }
inline int square_distance(Square s1, Square s2) { inline int square_distance(Square s1, Square s2) {
@ -149,8 +141,8 @@ inline char rank_to_char(Rank r) {
} }
inline const std::string square_to_string(Square s) { inline const std::string square_to_string(Square s) {
return std::string(1, file_to_char(square_file(s))) char ch[] = { file_to_char(square_file(s)), rank_to_char(square_rank(s)), 0 };
+ std::string(1, rank_to_char(square_rank(s))); return std::string(ch);
} }
inline bool file_is_ok(File f) { inline bool file_is_ok(File f) {