Reformat previous patch

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 5b40ded8e0b5911636e9651f0b81d380e186d198..acb57b2e7a4d9fa2260cda3bde57ac8959a7747c 100644 (file)
--- 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-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
@@ -30,21 +30,23 @@
 
 
 /// The Stats struct stores moves statistics. According to the template parameter
-/// the class can store both History and Gains type statistics. History records
+/// the class can store History, Gains and Refutations statistics. History records
 /// how often different moves have been successful or unsuccessful during the
 /// current search and is used for reduction and move ordering decisions. Gains
 /// records the move's best evaluation gain from one ply to the next and is used
-/// for pruning decisions. 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.
-template<bool Gain>
+/// for pruning decisions. Refutations store the move that refute a previous one.
+/// 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.
+template<bool Gain, typename T>
 struct Stats {
 
   static const Value Max = Value(2000);
 
-  const Value* operator[](Piece p) const { return &table[p][0]; }
+  const T* operator[](Piece p) const { return &table[p][0]; }
   void clear() { memset(table, 0, sizeof(table)); }
 
+  void update(Piece p, Square to, Move m) { table[p][to] = m; }
   void update(Piece p, Square to, Value v) {
 
     if (Gain)
@@ -55,11 +57,12 @@ struct Stats {
   }
 
 private:
-  Value table[PIECE_NB][SQUARE_NB];
+  T table[PIECE_NB][SQUARE_NB];
 };
 
-typedef Stats<false> History;
-typedef Stats<true> Gains;
+typedef Stats<true, Value> Gains;
+typedef Stats<false, Value> History;
+typedef Stats<false, Move> Refutations;
 
 
 /// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -74,7 +77,7 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
 
 public:
-  MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
+  MovePicker(const Position&, Move, Depth, const History&, const Refutations&, Search::Stack*, Value);
   MovePicker(const Position&, Move, Depth, const History&, Square);
   MovePicker(const Position&, Move, const History&, PieceType);
   template<bool SpNode> Move next_move();
@@ -88,7 +91,7 @@ private:
   Search::Stack* ss;
   Depth depth;
   Move ttMove;
-  MoveStack killers[2];
+  MoveStack killers[3];
   Square recaptureSquare;
   int captureThreshold, phase;
   MoveStack *cur, *end, *endQuiets, *endBadCaptures;