/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <cassert>
#include <cstddef> // For offsetof()
+#include <deque>
+#include <memory> // For std::unique_ptr
+#include <string>
+#include <vector>
#include "bitboard.h"
#include "types.h"
class Position;
-struct Thread;
+class Thread;
-/// CheckInfo struct is initialized at c'tor time and keeps info used to detect
-/// if a move gives check.
+namespace PSQT {
+
+ extern Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
+
+ void init();
+}
+
+/// CheckInfo struct is initialized at constructor time and keeps info used to
+/// detect if a move gives check.
struct CheckInfo {
Bitboard dcCandidates;
Bitboard pinned;
- Bitboard checkSq[PIECE_TYPE_NB];
+ Bitboard checkSquares[PIECE_TYPE_NB];
Square ksq;
};
StateInfo* previous;
};
-
-/// When making a move the current StateInfo up to 'key' excluded is copied to
-/// the new one. Here we calculate the quad words (64 bit) needed to be copied.
-const size_t StateCopySize64 = offsetof(StateInfo, key) / sizeof(uint64_t) + 1;
+// In a std::deque references to elements are unaffected upon resizing
+typedef std::unique_ptr<std::deque<StateInfo>> StateListPtr;
/// Position class stores information regarding the board representation as
class Position {
- friend std::ostream& operator<<(std::ostream&, const Position&);
-
- Position(const Position&); // Disable the default copy constructor
-
public:
static void init();
- Position() {} // To define the global object RootPos
- Position(const Position& pos, Thread* th) { *this = pos; thisThread = th; }
- Position(const std::string& f, bool c960, Thread* th) { set(f, c960, th); }
- Position& operator=(const Position&); // To assign RootPos from UCI
+ Position() = default;
+ Position(const Position&) = delete;
+ Position& operator=(const Position&) = delete;
// FEN string input/output
- void set(const std::string& fenStr, bool isChess960, Thread* th);
+ Position& set(const std::string& fenStr, bool isChess960, StateInfo* si, Thread* th);
const std::string fen() const;
// Position representation
Bitboard pieces(Color c, PieceType pt) const;
Bitboard pieces(Color c, PieceType pt1, PieceType pt2) const;
Piece piece_on(Square s) const;
- Square king_square(Color c) const;
Square ep_square() const;
bool empty(Square s) const;
template<PieceType Pt> int count(Color c) const;
- template<PieceType Pt> const Square* list(Color c) const;
+ template<PieceType Pt> const Square* squares(Color c) const;
+ template<PieceType Pt> Square square(Color c) const;
// Castling
int can_castle(Color c) const;
// Piece specific
bool pawn_passed(Color c, Square s) const;
- bool pawn_on_7th(Color c) const;
bool opposite_bishops() const;
// Doing and undoing moves
- void do_move(Move m, StateInfo& st);
- void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
+ void do_move(Move m, StateInfo& st, bool givesCheck);
void undo_move(Move m);
void do_null_move(StateInfo& st);
void undo_null_move();
Value non_pawn_material(Color c) const;
// Position consistency check, for debugging
- bool pos_is_ok(int* step = NULL) const;
+ bool pos_is_ok(int* failedStep = nullptr) const;
void flip();
private:
// Initialization helpers (used while setting up a position)
- void clear();
void set_castling_right(Color c, Square rfrom);
void set_state(StateInfo* si) const;
// Other helpers
Bitboard check_blockers(Color c, Color kingColor) const;
- void put_piece(Square s, Color c, PieceType pt);
- void remove_piece(Square s, Color c, PieceType pt);
- void move_piece(Square from, Square to, Color c, PieceType pt);
+ void put_piece(Color c, PieceType pt, Square s);
+ void remove_piece(Color c, PieceType pt, Square s);
+ void move_piece(Color c, PieceType pt, Square from, Square to);
template<bool Do>
- void do_castling(Square from, Square& to, Square& rfrom, Square& rto);
+ void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto);
// Data members
Piece board[SQUARE_NB];
int castlingRightsMask[SQUARE_NB];
Square castlingRookSquare[CASTLING_RIGHT_NB];
Bitboard castlingPath[CASTLING_RIGHT_NB];
- StateInfo startState;
uint64_t nodes;
int gamePly;
Color sideToMove;
bool chess960;
};
+extern std::ostream& operator<<(std::ostream& os, const Position& pos);
+
inline Color Position::side_to_move() const {
return sideToMove;
}
return pieceCount[c][Pt];
}
-template<PieceType Pt> inline const Square* Position::list(Color c) const {
+template<PieceType Pt> inline const Square* Position::squares(Color c) const {
return pieceList[c][Pt];
}
-inline Square Position::king_square(Color c) const {
- return pieceList[c][KING][0];
+template<PieceType Pt> inline Square Position::square(Color c) const {
+ assert(pieceCount[c][Pt] == 1);
+ return pieceList[c][Pt][0];
}
inline Square Position::ep_square() const {
inline bool Position::opposite_bishops() const {
return pieceCount[WHITE][BISHOP] == 1
&& pieceCount[BLACK][BISHOP] == 1
- && opposite_colors(pieceList[WHITE][BISHOP][0], pieceList[BLACK][BISHOP][0]);
-}
-
-inline bool Position::pawn_on_7th(Color c) const {
- return pieces(c, PAWN) & rank_bb(relative_rank(c, RANK_7));
+ && opposite_colors(square<BISHOP>(WHITE), square<BISHOP>(BLACK));
}
inline bool Position::is_chess960() const {
return thisThread;
}
-inline void Position::put_piece(Square s, Color c, PieceType pt) {
+inline void Position::put_piece(Color c, PieceType pt, Square s) {
board[s] = make_piece(c, pt);
byTypeBB[ALL_PIECES] |= s;
pieceCount[c][ALL_PIECES]++;
}
-inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) {
-
- // index[from] is not updated and becomes stale. This works as long as index[]
- // is accessed just by known occupied squares.
- Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to];
- byTypeBB[ALL_PIECES] ^= from_to_bb;
- byTypeBB[pt] ^= from_to_bb;
- byColorBB[c] ^= from_to_bb;
- board[from] = NO_PIECE;
- board[to] = make_piece(c, pt);
- index[to] = index[from];
- pieceList[c][pt][index[to]] = to;
-}
-
-inline void Position::remove_piece(Square s, Color c, PieceType pt) {
+inline void Position::remove_piece(Color c, PieceType pt, Square s) {
// WARNING: This is not a reversible operation. If we remove a piece in
// do_move() and then replace it in undo_move() we will put it at the end of
pieceCount[c][ALL_PIECES]--;
}
+inline void Position::move_piece(Color c, PieceType pt, Square from, Square to) {
+
+ // index[from] is not updated and becomes stale. This works as long as index[]
+ // is accessed just by known occupied squares.
+ Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to];
+ byTypeBB[ALL_PIECES] ^= from_to_bb;
+ byTypeBB[pt] ^= from_to_bb;
+ byColorBB[c] ^= from_to_bb;
+ board[from] = NO_PIECE;
+ board[to] = make_piece(c, pt);
+ index[to] = index[from];
+ pieceList[c][pt][index[to]] = to;
+}
+
#endif // #ifndef POSITION_H_INCLUDED
projects / stockfish / blobdiff