X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=97b1b3abb7f1aaeded105cb068e47b6ceab15c69;hp=d3bca28a7ae982aa1cd619c3a581f532711a6020;hb=99d914985f6ddb1ee22b232d41f17a35e1d34f89;hpb=ecc5ff6693f116f4a8ae5f5080252f29b279c0a1

diff --git a/src/movepick.h b/src/movepick.h
index d3bca28a..97b1b3ab 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -2,6 +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-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
@@ -20,60 +21,68 @@
 #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 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>
-struct Stats {
+/// 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);
+  static const int Max = 1 << 28;
 
-  const T* operator[](Piece pc) const { return table[pc]; }
-  T* operator[](Piece pc) { return table[pc]; }
+  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) {
 
-  void update(Piece pc, Square to, Move m) {
+    Square from = from_sq(m);
+    Square to = to_sq(m);
 
-    if (m != table[pc][to])
-        table[pc][to] = m;
-  }
+    const int D = 324;
 
-  void updateH(Piece pc, Square to, Value v) {
+    assert(abs(v) <= D); // Consistency check for below formula
 
-    if (abs(int(v)) >= 324) 
-        return;
-    table[pc][to] -= table[pc][to] * abs(int(v)) / 324;
-    table[pc][to] += int(v) * 32;
+    table[c][from][to] -= table[c][from][to] * abs(v) / D;
+    table[c][from][to] += v * 32;
   }
 
-  void updateCMH(Piece pc, Square to, Value v) {
+private:
+  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 update(Piece pc, Square to, Move m) { table[pc][to] = m; }
+  void update(Piece pc, Square to, int v) {
+
+    const int D = 936;
+
+    assert(abs(v) <= D); // Consistency check for below formula
 
-    if (abs(int(v)) >= 324) 
-        return;
-    table[pc][to] -= table[pc][to] * abs(int(v)) / 512;
-    table[pc][to] += int(v) * 64;
+    table[pc][to] -= table[pc][to] * abs(v) / D;
+    table[pc][to] += v * 32;
   }
 
 private:
   T table[PIECE_NB][SQUARE_NB];
 };
 
-typedef Stats<Value> HistoryStats;
-typedef Stats<Move> MovesStats;
-typedef Stats<HistoryStats> CounterMovesHistoryStats;
+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
@@ -82,37 +91,35 @@ typedef Stats<HistoryStats> CounterMovesHistoryStats;
 /// 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(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square);
-  MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, Value);
-  MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*);
+  MovePicker(const Position&, Move, Value);
+  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();
-  void generate_next_stage();
-  ExtMove* begin() { return moves; }
+  ExtMove* begin() { return cur; }
   ExtMove* end() { return endMoves; }
 
   const Position& pos;
-  const HistoryStats& history;
-  const CounterMovesHistoryStats& counterMovesHistory;
-  Search::Stack* ss;
+  const Search::Stack* ss;
+  Move killers[2];
   Move countermove;
   Depth depth;
   Move ttMove;
-  ExtMove killers[3];
   Square recaptureSquare;
   Value threshold;
   int stage;
-  ExtMove *endQuiets, *endBadCaptures = moves + MAX_MOVES - 1;
-  ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
+  ExtMove *cur, *endMoves, *endBadCaptures;
+  ExtMove moves[MAX_MOVES];
 };
 
 #endif // #ifndef MOVEPICK_H_INCLUDED