Start to templetize pawn move generators

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index b60dfe06ac0c224717c652458e2911a59dacdfd0..af34711df40e15e6892b748ff9e1cf9409d91c08 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -59,8 +59,7 @@ public:
     PH_STOP
   };
 
-  MovePicker(Position &p, bool pvnode, Move ttm, Move mk, Move k1, Move k2,
-             Depth dpth);
+  MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
   Move get_next_move();
   Move get_next_move(Lock &lock);
   int number_of_moves() const;
@@ -76,8 +75,9 @@ private:
   void score_evasions();
   void score_qcaptures();
   Move pick_move_from_list();
+  int find_best_index();
   
-  Position *pos;
+  const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
   MoveStack moves[256], badCaptures[64];
@@ -87,7 +87,6 @@ private:
   int numOfMoves, numOfBadCaptures;
   int movesPicked, badCapturesPicked;
   bool finished;
-  bool All_zero;
 };
 
 
@@ -95,6 +94,15 @@ private:
 //// Inline functions
 ////
 
+/// MovePicker::number_of_moves() simply returns the numOfMoves member
+/// variable. It is intended to be used in positions where the side to move
+/// is in check, for detecting checkmates or situations where there is only
+/// a single reply to check.
+
+inline int MovePicker::number_of_moves() const {
+  return numOfMoves;
+}
+
 /// MovePicker::discovered_check_candidates() returns a bitboard containing
 /// all pieces which can possibly give discovered check.  This bitboard is
 /// computed by the constructor function.