X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=3614439fca05cdb6df7a3bad6833dfdad3d33024;hp=7d6651bb5da07c8c1bd87b9c6b26e7cb86384732;hb=9da3b44ddc7bc9ea7094b91663cbc0f8319c46be;hpb=53051eefc741586f72ccbf9a765592c4ca6030bd

diff --git a/src/movepick.h b/src/movepick.h
index 7d6651bb..3614439f 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,8 @@
 /*
   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-2015 Marco Costalba, Joona Kiiski, 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
@@ -17,72 +18,109 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
+#include <algorithm> // For std::max
+#include <cstring>   // For std::memset
+
+#include "movegen.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.
+/// 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 {
 
-class History {
-public:
+  static const int Max = 1 << 28;
+
+  int 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(Color c, Move m, int v) {
+
+    Square from = from_sq(m);
+    Square to = to_sq(m);
 
-  static const Value Max = Value(2000);
+    const int denom = 324;
 
-  const Value* operator[](Piece p) const { return &history[p][0]; }
-  Value gain(Piece p, Square to) const { return gains[p][to]; }
+    assert(abs(int(v)) <= denom); // Needed for stability.
 
-  void clear();
-  void update(Piece p, Square to, Value bonus);
-  void update_gain(Piece p, Square to, Value gain);
+    table[c][from][to] -= table[c][from][to] * abs(int(v)) / denom;
+    table[c][from][to] += int(v) * 32;
+  }
 
 private:
-  Value history[PIECE_NB][SQUARE_NB];
-  Value gains[PIECE_NB][SQUARE_NB];
+  int table[COLOR_NB][SQUARE_NB][SQUARE_NB];
 };
 
 
+/// 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 fill(const int& 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, int v) {
+
+    const int denom = 936;
+
+    assert(abs(int(v)) <= denom); // Needed for stability.
+
+    table[pc][to] -= table[pc][to] * abs(int(v)) / denom;
+    table[pc][to] += int(v) * 32;
+  }
+
+private:
+  T table[PIECE_NB][SQUARE_NB];
+};
+
+typedef Stats<Move> MoveStats;
+typedef Stats<int> 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
 /// new pseudo legal move each time it is called, until there are no moves left,
 /// when MOVE_NONE is returned. In order to improve the efficiency of the alpha
 /// beta algorithm, MovePicker attempts to return the moves which are most likely
 /// to get a cut-off first.
+namespace Search { struct Stack; }
 
 class MovePicker {
+public:
+  MovePicker(const MovePicker&) = delete;
+  MovePicker& operator=(const MovePicker&) = delete;
 
-  MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+  MovePicker(const Position&, Move, Value);
+  MovePicker(const Position&, Move, Depth, Square);
+  MovePicker(const Position&, Move, Depth, Search::Stack*);
 
-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);
-  template<bool SpNode> Move next_move();
+  Move next_move(bool skipQuiets = false);
 
 private:
-  void score_captures();
-  void score_noncaptures();
-  void score_evasions();
-  void generate_next();
+  template<GenType> void score();
+  ExtMove* begin() { return cur; }
+  ExtMove* end() { return endMoves; }
 
   const Position& pos;
-  const History& H;
-  Search::Stack* ss;
+  const Search::Stack* ss;
+  Move countermove;
   Depth depth;
   Move ttMove;
-  MoveStack killers[2];
   Square recaptureSquare;
-  int captureThreshold, phase;
-  MoveStack *cur, *end, *endQuiets, *endBadCaptures;
-  MoveStack moves[MAX_MOVES];
+  Value threshold;
+  int stage;
+  ExtMove *cur, *endMoves, *endBadCaptures;
+  ExtMove moves[MAX_MOVES];
 };
 
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED