X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=d97bb62909c71ceb38ed0affba20216994b99bd2;hp=6c73629916a01afdbb24a29f25f1f352f80ca9e3;hb=afae86bfb49471113f14f9f0f56f2a08d052242f;hpb=cf71efc34bc6528a3a980aa0b9eec27770095eb8

diff --git a/src/movepick.h b/src/movepick.h
index 6c736299..d97bb629 100644
--- a/src/movepick.h
+++ b/src/movepick.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-2009 Marco Costalba
+  Copyright (C) 2008-2010 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,24 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include "depth.h"
 #include "history.h"
-#include "lock.h"
 #include "position.h"
 
-
-////
-//// Types
-////
-
 struct SearchStack;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
@@ -50,11 +39,10 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value beta);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h);
   Move get_next_move();
-  Move get_next_move(Lock& lock);
   int number_of_evasions() const;
-  Bitboard discovered_check_candidates() const;
 
 private:
   void score_captures();
@@ -64,20 +52,15 @@ private:
 
   const Position& pos;
   const History& H;
+  Bitboard pinned;
   MoveStack ttMoves[2], killers[2];
-  bool finished;
-  int phase;
+  int badCaptureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
-  Bitboard dc, pinned;
-  MoveStack moves[256], badCaptures[64];
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack moves[MOVES_MAX];
 };
 
 
-////
-//// Inline functions
-////
-
 /// MovePicker::number_of_evasions() simply returns the number of moves in
 /// evasions phase. It is intended to be used in positions where the side to
 /// move is in check, for detecting checkmates or situations where there is
@@ -88,12 +71,4 @@ inline int MovePicker::number_of_evasions() const {
   return int(lastMove - moves);
 }
 
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
-
-inline Bitboard MovePicker::discovered_check_candidates() const {
-  return dc;
-}
-
 #endif // !defined(MOVEPICK_H_INCLUDED)