Retire history.h

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 317a0fc9165beed06c70d777f2f59f67fc26fc8b..7d6651bb5da07c8c1bd87b9c6b26e7cb86384732 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -20,12 +20,36 @@
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-#include "history.h"
 #include "position.h"
 #include "search.h"
 #include "types.h"
 
 
+/// The History class stores statistics about how often different moves
+/// have been successful or unsuccessful during the current search. These
+/// statistics are used for reduction and move ordering decisions. History
+/// entries are stored according only to moving piece and destination square,
+/// in particular two moves with different origin but same destination and
+/// same piece will be considered identical.
+
+class History {
+public:
+
+  static const Value Max = Value(2000);
+
+  const Value* operator[](Piece p) const { return &history[p][0]; }
+  Value gain(Piece p, Square to) const { return gains[p][to]; }
+
+  void clear();
+  void update(Piece p, Square to, Value bonus);
+  void update_gain(Piece p, Square to, Value gain);
+
+private:
+  Value history[PIECE_NB][SQUARE_NB];
+  Value gains[PIECE_NB][SQUARE_NB];
+};
+
+
 /// MovePicker class is used to pick one pseudo legal move at a time from the
 /// current position. The most important method is next_move(), which returns a
 /// new pseudo legal move each time it is called, until there are no moves left,
@@ -41,22 +65,23 @@ public:
   MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
   MovePicker(const Position&, Move, Depth, const History&, Square);
   MovePicker(const Position&, Move, const History&, PieceType);
-  Move next_move();
+  template<bool SpNode> Move next_move();
 
 private:
   void score_captures();
   void score_noncaptures();
   void score_evasions();
-  void next_phase();
+  void generate_next();
 
   const Position& pos;
   const History& H;
+  Search::Stack* ss;
   Depth depth;
   Move ttMove;
   MoveStack killers[2];
   Square recaptureSquare;
   int captureThreshold, phase;
-  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
+  MoveStack *cur, *end, *endQuiets, *endBadCaptures;
   MoveStack moves[MAX_MOVES];
 };