X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=36d8869598292e87b158c96e4c4d4a93dc3d2690;hp=ea7f37c685dcfd98d74683829cfc67ee893210b2;hb=67338e6f322b8f8ec0d897815e16a87937efc9b0;hpb=bc76c62c6302a445860e1deef5f55c2aabb7377d

diff --git a/src/position.h b/src/position.h
index ea7f37c6..36d88695 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -23,20 +23,20 @@
 #include <cassert>
 
 #include "bitboard.h"
-#include "move.h"
 #include "types.h"
 
 
 /// The checkInfo struct is initialized at c'tor time and keeps info used
 /// to detect if a move gives check.
+class Position;
 
 struct CheckInfo {
 
-    explicit CheckInfo(const Position&);
+  explicit CheckInfo(const Position&);
 
-    Bitboard dcCandidates;
-    Bitboard pinned;
-    Bitboard checkSq[8];
+  Bitboard dcCandidates;
+  Bitboard pinned;
+  Bitboard checkSq[8];
 };
 
 
@@ -44,7 +44,6 @@ struct CheckInfo {
 /// object to its previous state when we retract a move. Whenever a move
 /// is made on the board (by calling Position::do_move), an StateInfo object
 /// must be passed as a parameter.
-class Position;
 
 struct StateInfo {
   Key pawnKey, materialKey;
@@ -84,16 +83,17 @@ struct StateInfo {
 
 class Position {
 
-  // No defaul, copy c'tor or assignment allowed, default c'tor will not be
-  // generated anyhow because of user-defined c'tors.
+  // No copy c'tor or assignment operator allowed
   Position(const Position&);
   Position& operator=(const Position&);
 
 public:
-  Position(const Position& pos, int threadID);
-  Position(const std::string& fen, bool isChess960, int threadID);
+  Position() {}
+  Position(const Position& pos, int th) { copy(pos, th); }
+  Position(const std::string& fen, bool isChess960, int th);
 
   // Text input/output
+  void copy(const Position& pos, int th);
   void from_fen(const std::string& fen, bool isChess960);
   const std::string to_fen() const;
   void print(Move m = MOVE_NONE) const;
@@ -173,10 +173,10 @@ public:
   int see_sign(Move m) const;
 
   // Accessing hash keys
-  Key get_key() const;
-  Key get_exclusion_key() const;
-  Key get_pawn_key() const;
-  Key get_material_key() const;
+  Key key() const;
+  Key exclusion_key() const;
+  Key pawn_key() const;
+  Key material_key() const;
 
   // Incremental evaluation
   Score value() const;
@@ -216,11 +216,9 @@ private:
   void set_castle_right(Square ksq, Square rsq);
   bool move_is_legal(const Move m) const;
 
-  // Helper functions for doing and undoing moves
+  // Helper template functions
   template<bool Do> void do_castle_move(Move m);
-
-  template<bool FindPinned>
-  Bitboard hidden_checkers() const;
+  template<bool FindPinned> Bitboard hidden_checkers() const;
 
   // Computing hash keys from scratch (for initialization and debugging)
   Key compute_key() const;
@@ -280,7 +278,7 @@ inline Piece Position::piece_on(Square s) const {
 }
 
 inline bool Position::square_is_empty(Square s) const {
-  return board[s] == PIECE_NONE;
+  return board[s] == NO_PIECE;
 }
 
 inline Color Position::side_to_move() const {
@@ -384,23 +382,31 @@ inline bool Position::in_check() const {
   return st->checkersBB != 0;
 }
 
+inline Bitboard Position::discovered_check_candidates() const {
+  return hidden_checkers<false>();
+}
+
+inline Bitboard Position::pinned_pieces() const {
+  return hidden_checkers<true>();
+}
+
 inline bool Position::pawn_is_passed(Color c, Square s) const {
   return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
 }
 
-inline Key Position::get_key() const {
+inline Key Position::key() const {
   return st->key;
 }
 
-inline Key Position::get_exclusion_key() const {
+inline Key Position::exclusion_key() const {
   return st->key ^ zobExclusion;
 }
 
-inline Key Position::get_pawn_key() const {
+inline Key Position::pawn_key() const {
   return st->pawnKey;
 }
 
-inline Key Position::get_material_key() const {
+inline Key Position::material_key() const {
   return st->materialKey;
 }
 
@@ -422,8 +428,8 @@ inline Value Position::non_pawn_material(Color c) const {
 
 inline bool Position::is_passed_pawn_push(Move m) const {
 
-  return   board[move_from(m)] == make_piece(sideToMove, PAWN)
-        && pawn_is_passed(sideToMove, move_to(m));
+  return   board[from_sq(m)] == make_piece(sideToMove, PAWN)
+        && pawn_is_passed(sideToMove, to_sq(m));
 }
 
 inline int Position::startpos_ply_counter() const {
@@ -448,14 +454,14 @@ inline bool Position::is_chess960() const {
 inline bool Position::is_capture_or_promotion(Move m) const {
 
   assert(is_ok(m));
-  return is_special(m) ? !is_castle(m) : !square_is_empty(move_to(m));
+  return is_special(m) ? !is_castle(m) : !square_is_empty(to_sq(m));
 }
 
 inline bool Position::is_capture(Move m) const {
 
   // Note that castle is coded as "king captures the rook"
   assert(is_ok(m));
-  return (!square_is_empty(move_to(m)) && !is_castle(m)) || is_enpassant(m);
+  return (!square_is_empty(to_sq(m)) && !is_castle(m)) || is_enpassant(m);
 }
 
 inline PieceType Position::captured_piece_type() const {