X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=3da25b6f57e4c6e54b8e62af18c84e9717d385ee;hb=62c707e1d5a33c0c431d9938997b63e9cdbd4aeb;hp=cc70bcf815fbd8c58cf3366f9afca5905f5dd6d3;hpb=0da461f23b84990d17e1f1341aeb7c0589ab98e7;p=stockfish
diff --git a/src/position.h b/src/position.h
index cc70bcf8..3da25b6f 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,36 +17,22 @@
along with this program. If not, see .
*/
-
#if !defined(POSITION_H_INCLUDED)
#define POSITION_H_INCLUDED
-////
-//// Includes
-////
-
#include "bitboard.h"
#include "color.h"
-#include "direction.h"
#include "move.h"
#include "piece.h"
#include "square.h"
#include "value.h"
-
-////
-//// Constants
-////
-
/// Maximum number of plies per game (220 should be enough, because the
/// maximum search depth is 100, and during position setup we reset the
/// move counter for every non-reversible move).
const int MaxGameLength = 220;
-
-////
-//// Types
-////
+class Position;
/// struct checkInfo is initialized at c'tor time and keeps
/// info used to detect if a move gives check.
@@ -135,10 +121,10 @@ public:
// Constructors
Position(const Position& pos, int threadID);
- Position(const std::string& fen, int threadID);
+ Position(const std::string& fen, bool isChess960, int threadID);
// Text input/output
- void from_fen(const std::string& fen);
+ void from_fen(const std::string& fen, bool isChess960);
const std::string to_fen() const;
void print(Move m = MOVE_NONE) const;
@@ -197,6 +183,7 @@ public:
// Information about attacks to or from a given square
Bitboard attackers_to(Square s) const;
Bitboard attacks_from(Piece p, Square s) const;
+ static Bitboard attacks_from(Piece p, Square s, Bitboard occ);
template Bitboard attacks_from(Square s) const;
template Bitboard attacks_from(Square s, Color c) const;
@@ -220,7 +207,7 @@ public:
bool square_is_weak(Square s, Color c) const;
// Doing and undoing moves
- void detach();
+ void do_setup_move(Move m);
void do_move(Move m, StateInfo& st);
void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
void undo_move(Move m);
@@ -250,9 +237,7 @@ public:
// Check if side to move could be mated in one
bool has_mate_threat();
- // Number of plies since the last non-reversible move
- int rule_50_counter() const;
-
+ // Number of plies from starting position
int startpos_ply_counter() const;
// Other properties of the position
@@ -263,9 +248,6 @@ public:
// Current thread ID searching on the position
int thread() const;
- // Reset the gamePly variable to 0
- void reset_game_ply();
- void inc_startpos_ply_counter();
int64_t nodes_searched() const;
void set_nodes_searched(int64_t n);
@@ -280,6 +262,7 @@ private:
// Initialization helper functions (used while setting up a position)
void clear();
+ void detach();
void put_piece(Piece p, Square s);
void do_allow_oo(Color c);
void do_allow_ooo(Color c);
@@ -341,11 +324,6 @@ private:
static const Value PieceValueEndgame[17];
};
-
-////
-//// Inline functions
-////
-
inline int64_t Position::nodes_searched() const {
return nodes;
}
@@ -456,12 +434,12 @@ inline Square Position::initial_qr_square(Color c) const {
template<>
inline Bitboard Position::attacks_from(Square s, Color c) const {
- return StepAttackBB[piece_of_color_and_type(c, PAWN)][s];
+ return NonSlidingAttacksBB[piece_of_color_and_type(c, PAWN)][s];
}
template // Knight and King and white pawns
inline Bitboard Position::attacks_from(Square s) const {
- return StepAttackBB[Piece][s];
+ return NonSlidingAttacksBB[Piece][s];
}
template<>
@@ -534,23 +512,18 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
&& pawn_is_passed(c, move_to(m));
}
-inline int Position::rule_50_counter() const {
- return st->rule50;
-}
-
inline int Position::startpos_ply_counter() const {
return startPosPlyCounter;
}
inline bool Position::opposite_colored_bishops() const {
- return piece_count(WHITE, BISHOP) == 1
- && piece_count(BLACK, BISHOP) == 1
- && !same_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
+ return piece_count(WHITE, BISHOP) == 1 && piece_count(BLACK, BISHOP) == 1
+ && opposite_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
}
inline bool Position::has_pawn_on_7th(Color c) const {
- return pieces(PAWN, c) & relative_rank_bb(c, RANK_7);
+ return pieces(PAWN, c) & rank_bb(relative_rank(c, RANK_7));
}
inline bool Position::is_chess960() const {