Simple always overwrite Refutation table

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 3be429ed1be2a0193a5d32afe95121c102fae3a9..90475b3512e15dba6939a4fde9fd130305b15eb1 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
@@ -23,6 +23,7 @@
 #include <algorithm> // For std::max
 #include <cstring>   // For memset
 
+#include "movegen.h"
 #include "position.h"
 #include "search.h"
 #include "types.h"
@@ -60,6 +61,17 @@ private:
 typedef Stats<false> History;
 typedef Stats<true> Gains;
 
+// FIXME: Document me
+struct RefutationTable {
+
+  void clear() { memset(table, 0, sizeof(table)); }
+  void update(Piece p, Square to, Move m) { table[p][to] = m; }
+  Move get(Piece p, Square to) const { return table[p][to]; }
+
+private:
+  Move table[PIECE_NB][SQUARE_NB]; // Mapping: "move A" -> "move B which refutes move A"
+
+};
 
 /// 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
@@ -73,15 +85,13 @@ 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&, Search::Stack*, Move, Value);
   MovePicker(const Position&, Move, Depth, const History&, Square);
   MovePicker(const Position&, Move, const History&, PieceType);
   template<bool SpNode> Move next_move();
 
 private:
-  void score_captures();
-  void score_noncaptures();
-  void score_evasions();
+  template<GenType> void score();
   void generate_next();
 
   const Position& pos;
@@ -89,7 +99,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;