From a9fa1fc7f76458b9e09410fe966f03324ada3cb3 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 18 Apr 2010 09:58:57 +0100 Subject: [PATCH] Retire Position::pawn_is_passed() and friends Absolutely no useful at all, just code obfuscation so use real definition instead. No functional change. Signed-off-by: Marco Costalba --- src/pawns.cpp | 6 +++--- src/position.h | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/pawns.cpp b/src/pawns.cpp index 8f4232d7..2459a6b0 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -206,9 +206,9 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN)); // Passed, isolated or doubled pawn? - passed = Position::pawn_is_passed(theirPawns, Us, s); - isolated = Position::pawn_is_isolated(ourPawns, s); - doubled = Position::pawn_is_doubled(ourPawns, Us, s); + passed = !(theirPawns & passed_pawn_mask(Us, s)); + isolated = !(ourPawns & neighboring_files_bb(s)); + doubled = ourPawns & squares_behind(Us, s); // We calculate kingside and queenside pawn storm // scores for both colors. These are used when evaluating diff --git a/src/position.h b/src/position.h index 0aac1c36..8121bec1 100644 --- a/src/position.h +++ b/src/position.h @@ -228,9 +228,6 @@ public: // Information about pawns bool pawn_is_passed(Color c, Square s) const; - static bool pawn_is_passed(Bitboard theirPawns, Color c, Square s); - static bool pawn_is_isolated(Bitboard ourPawns, Square s); - static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s); // Weak squares bool square_is_weak(Square s, Color c) const; @@ -485,18 +482,6 @@ inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } -inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) { - return !(theirPawns & passed_pawn_mask(c, s)); -} - -inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) { - return !(ourPawns & neighboring_files_bb(s)); -} - -inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) { - return ourPawns & squares_behind(c, s); -} - inline bool Position::square_is_weak(Square s, Color c) const { return !(pieces(PAWN, c) & outpost_mask(opposite_color(c), s)); } -- 2.39.2