X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=512313921458cae7d843214644026f2d7399fe25;hb=002062ae934c1fae3e56157e8e7e6451b552ada5;hp=7fb840b669df9b133c50e005b1b1c117f29c2828;hpb=e82382703c96cfc480555e9db29d999e1f54a38f;p=stockfish
diff --git a/src/position.h b/src/position.h
index 7fb840b6..51231392 100644
--- a/src/position.h
+++ b/src/position.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(POSITION_H_INCLUDED)
+#ifndef POSITION_H_INCLUDED
#define POSITION_H_INCLUDED
#include
@@ -30,7 +30,7 @@
/// The checkInfo struct is initialized at c'tor time and keeps info used
/// to detect if a move gives check.
class Position;
-class Thread;
+struct Thread;
struct CheckInfo {
@@ -52,7 +52,7 @@ struct StateInfo {
Key pawnKey, materialKey;
Value npMaterial[COLOR_NB];
int castleRights, rule50, pliesFromNull;
- Score psqScore;
+ Score psq;
Square epSquare;
Key key;
@@ -95,6 +95,7 @@ public:
Position(const Position& p, Thread* t) { *this = p; thisThread = t; }
Position(const std::string& f, bool c960, Thread* t) { set(f, c960, t); }
Position& operator=(const Position&);
+ static void init();
// Text input/output
void set(const std::string& fen, bool isChess960, Thread* th);
@@ -112,8 +113,8 @@ public:
Square king_square(Color c) const;
Square ep_square() const;
bool is_empty(Square s) const;
- const Square* piece_list(Color c, PieceType pt) const;
- int piece_count(Color c, PieceType pt) const;
+ template int count(Color c) const;
+ template const Square* list(Color c) const;
// Castling
int can_castle(CastleRight f) const;
@@ -154,10 +155,11 @@ public:
void do_move(Move m, StateInfo& st);
void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
void undo_move(Move m);
- template void do_null_move(StateInfo& st);
+ void do_null_move(StateInfo& st);
+ void undo_null_move();
// Static exchange evaluation
- int see(Move m) const;
+ int see(Move m, int asymmThreshold = 0) const;
int see_sign(Move m) const;
// Accessing hash keys
@@ -168,17 +170,16 @@ public:
// Incremental piece-square evaluation
Score psq_score() const;
- Score psq_delta(Piece p, Square from, Square to) const;
Value non_pawn_material(Color c) const;
// Other properties of the position
Color side_to_move() const;
- int startpos_ply_counter() const;
+ int game_ply() const;
bool is_chess960() const;
Thread* this_thread() const;
int64_t nodes_searched() const;
void set_nodes_searched(int64_t n);
- template bool is_draw() const;
+ bool is_draw() const;
// Position consistency check, for debugging
bool pos_is_ok(int* failedStep = NULL) const;
@@ -190,9 +191,9 @@ private:
void put_piece(Piece p, Square s);
void set_castle_right(Color c, Square rfrom);
- // Helper template functions
- template void do_castle_move(Move m);
- template Bitboard hidden_checkers() const;
+ // Helper functions
+ void do_castle(Square kfrom, Square kto, Square rfrom, Square rto);
+ Bitboard hidden_checkers(Square ksq, Color c) const;
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
@@ -217,7 +218,7 @@ private:
Bitboard castlePath[COLOR_NB][CASTLING_SIDE_NB];
StateInfo startState;
int64_t nodes;
- int startPosPly;
+ int gamePly;
Color sideToMove;
Thread* thisThread;
StateInfo* st;
@@ -272,12 +273,12 @@ inline Bitboard Position::pieces(Color c, PieceType pt1, PieceType pt2) const {
return byColorBB[c] & (byTypeBB[pt1] | byTypeBB[pt2]);
}
-inline int Position::piece_count(Color c, PieceType pt) const {
- return pieceCount[c][pt];
+template inline int Position::count(Color c) const {
+ return pieceCount[c][Pt];
}
-inline const Square* Position::piece_list(Color c, PieceType pt) const {
- return pieceList[c][pt];
+template inline const Square* Position::list(Color c) const {
+ return pieceList[c][Pt];
}
inline Square Position::ep_square() const {
@@ -330,11 +331,11 @@ inline Bitboard Position::checkers() const {
}
inline Bitboard Position::discovered_check_candidates() const {
- return hidden_checkers();
+ return hidden_checkers(king_square(~sideToMove), sideToMove);
}
inline Bitboard Position::pinned_pieces() const {
- return hidden_checkers();
+ return hidden_checkers(king_square(sideToMove), ~sideToMove);
}
inline bool Position::pawn_is_passed(Color c, Square s) const {
@@ -345,10 +346,6 @@ inline Key Position::key() const {
return st->key;
}
-inline Key Position::exclusion_key() const {
- return st->key ^ Zobrist::exclusion;
-}
-
inline Key Position::pawn_key() const {
return st->pawnKey;
}
@@ -357,12 +354,8 @@ inline Key Position::material_key() const {
return st->materialKey;
}
-inline Score Position::psq_delta(Piece p, Square from, Square to) const {
- return pieceSquareTable[p][to] - pieceSquareTable[p][from];
-}
-
inline Score Position::psq_score() const {
- return st->psqScore;
+ return st->psq;
}
inline Value Position::non_pawn_material(Color c) const {
@@ -375,8 +368,8 @@ inline bool Position::is_passed_pawn_push(Move m) const {
&& pawn_is_passed(sideToMove, to_sq(m));
}
-inline int Position::startpos_ply_counter() const {
- return startPosPly + st->pliesFromNull; // HACK
+inline int Position::game_ply() const {
+ return gamePly;
}
inline bool Position::opposite_bishops() const {
@@ -421,4 +414,4 @@ inline Thread* Position::this_thread() const {
return thisThread;
}
-#endif // !defined(POSITION_H_INCLUDED)
+#endif // #ifndef POSITION_H_INCLUDED