X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=ef3be6c240f8d553b42c68756e48fa512b5bdf3d;hp=b59b0e93ba33a469419a9dbbfab8ecbad3eb6c6b;hb=ced29248c93de7fc5a4e284807f8f052006e647c;hpb=e0504ab876a997321102f040ab88203cb893db12

diff --git a/src/movepick.h b/src/movepick.h
index b59b0e93..ef3be6c2 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -2,7 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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
@@ -29,58 +29,63 @@
 #include "types.h"
 
 
-/// The Stats struct stores moves statistics. According to the template parameter
-/// the class can store History and Countermoves. History records how often
-/// different moves have been successful or unsuccessful during the current search
-/// and is used for reduction and move ordering decisions.
-/// Countermoves store the move that refute a previous one. Entries are stored
-/// using only the moving piece and destination square, hence two moves with
-/// different origin but same destination and piece will be considered identical.
-template<typename T, bool CM = false>
-struct Stats {
-  const T* operator[](Piece pc) const { return table[pc]; }
-  T* operator[](Piece pc) { return table[pc]; }
+/// HistoryStats records how often quiet moves have been successful or unsuccessful
+/// during the current search, and is used for reduction and move ordering decisions.
+struct HistoryStats {
+
+  static const Value Max = Value(1 << 28);
+
+  Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
   void clear() { std::memset(table, 0, sizeof(table)); }
-  void update(Piece pc, Square to, Move m) { table[pc][to] = m; }
-  void update(Piece pc, Square to, Value v) {
+  void update(Color c, Move m, Value v) {
 
-    if (abs(int(v)) >= 324)
-        return;
+    Square from = from_sq(m);
+    Square to = to_sq(m);
 
-    table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324);
-    table[pc][to] += int(v) * 32;
+    const int denom = 324;
+
+    assert(abs(int(v)) <= denom); // Needed for stability.
+
+    table[c][from][to] -= table[c][from][to] * abs(int(v)) / denom;
+    table[c][from][to] += int(v) * 32;
   }
 
 private:
-  T table[PIECE_NB][SQUARE_NB];
+  Value table[COLOR_NB][SQUARE_NB][SQUARE_NB];
 };
 
-typedef Stats<Move> MoveStats;
-typedef Stats<Value, true> CounterMoveStats;
-typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
 
-struct FromToStats {
-
-  static const Value Max = Value(1 << 28);
-
-  Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
+/// A template struct, used to generate MoveStats and CounterMoveHistoryStats:
+/// MoveStats store the move that refute a previous one.
+/// CounterMoveHistoryStats is like HistoryStats, but with two consecutive moves.
+/// Entries are stored using only the moving piece and destination square, hence
+/// two moves with different origin but same destination and piece will be
+/// considered identical.
+template<typename T>
+struct Stats {
+  const T* operator[](Piece pc) const { return table[pc]; }
+  T* operator[](Piece pc) { return table[pc]; }
   void clear() { std::memset(table, 0, sizeof(table)); }
-  void update(Color c, Move m, Value v) {
+  void fill(const Value& v) { std::fill(&table[0][0], &table[PIECE_NB-1][SQUARE_NB-1]+1, v); };
+  void update(Piece pc, Square to, Move m) { table[pc][to] = m; }
+  void update(Piece pc, Square to, Value v) {
 
-    if (abs(int(v)) >= 324)
-        return;
+    const int denom = 936;
 
-    Square from = from_sq(m);
-    Square to = to_sq(m);
+    assert(abs(int(v)) <= denom); // Needed for stability.
 
-    table[c][from][to] -= table[c][from][to] * abs(int(v)) / 324;
-    table[c][from][to] += int(v) * 32;
+    table[pc][to] -= table[pc][to] * abs(int(v)) / denom;
+    table[pc][to] += int(v) * 32;
   }
 
 private:
-  Value table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+  T table[PIECE_NB][SQUARE_NB];
 };
 
+typedef Stats<Move> MoveStats;
+typedef Stats<Value> CounterMoveStats;
+typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
+
 
 /// 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
@@ -99,7 +104,7 @@ public:
   MovePicker(const Position&, Move, Depth, Square);
   MovePicker(const Position&, Move, Depth, Search::Stack*);
 
-  Move next_move();
+  Move next_move(bool skipQuiets = false);
 
 private:
   template<GenType> void score();