X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=bc26606721413eb90ecae8923c7d4238960892d2;hp=6dd2a10d339e8b7584375e7cc63f7241eaea3852;hb=3703d12eb9599cfdc02c617537a6d1b36f7309b5;hpb=adb43cc0cca109c1d95fa8032e717762faa01563

diff --git a/src/tt.cpp b/src/tt.cpp
index 6dd2a10d..bc266067 100644
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -23,7 +23,6 @@
 ////
 
 #include <cassert>
-#include <cmath>
 #include <cstring>
 
 #include "movegen.h"
@@ -38,7 +37,7 @@ TranspositionTable TT;
 
 TranspositionTable::TranspositionTable() {
 
-  size = writes = 0;
+  size = 0;
   entries = 0;
   generation = 0;
 }
@@ -72,7 +71,6 @@ void TranspositionTable::set_size(size_t mbSize) {
                     << " MB for transposition table." << std::endl;
           Application::exit_with_failure();
       }
-      clear();
   }
 }
 
@@ -100,6 +98,7 @@ void TranspositionTable::clear() {
 
 void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, Move m, Value statV, Value kingD) {
 
+  int c1, c2, c3;
   TTEntry *tte, *replace;
   uint32_t posKey32 = posKey >> 32; // Use the high 32 bits as key
 
@@ -115,18 +114,18 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d,
           tte->save(posKey32, v, t, d, m, generation, statV, kingD);
           return;
       }
-      else if (i == 0)  // replace would be a no-op in this common case
+
+      if (i == 0)  // replace would be a no-op in this common case
           continue;
 
-      int c1 = (replace->generation() == generation ?  2 : 0);
-      int c2 = (tte->generation() == generation ? -2 : 0);
-      int c3 = (tte->depth() < replace->depth() ?  1 : 0);
+      c1 = (replace->generation() == generation ?  2 : 0);
+      c2 = (tte->generation() == generation ? -2 : 0);
+      c3 = (tte->depth() < replace->depth() ?  1 : 0);
 
       if (c1 + c2 + c3 > 0)
           replace = tte;
   }
   replace->save(posKey32, v, t, d, m, generation, statV, kingD);
-  writes++;
 }
 
 
@@ -153,9 +152,7 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const {
 /// entries from the current search.
 
 void TranspositionTable::new_search() {
-
   generation++;
-  writes = 0;
 }
 
 
@@ -179,24 +176,24 @@ void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
 }
 
 
-/// TranspositionTable::extract_pv() extends a PV by adding moves from the
-/// transposition table at the end. This should ensure that the PV is almost
-/// always at least two plies long, which is important, because otherwise we
-/// will often get single-move PVs when the search stops while failing high,
-/// and a single-move PV means that we don't have a ponder move.
+/// TranspositionTable::extract_pv() builds a PV by adding moves from the
+/// transposition table. We consider also failing high nodes and not only
+/// VALUE_TYPE_EXACT nodes. This allow to always have a ponder move even
+/// when we fail high at root and also a long PV to print that is important
+/// for position analysis.
 
-void TranspositionTable::extract_pv(const Position& pos, Move pv[], const int PLY_MAX) {
+void TranspositionTable::extract_pv(const Position& pos, Move bestMove, Move pv[], const int PLY_MAX) {
 
   const TTEntry* tte;
   StateInfo st;
   Position p(pos, pos.thread());
   int ply = 0;
 
-  assert(pv[0] != MOVE_NONE);
+  assert(bestMove != MOVE_NONE);
 
+  pv[ply] = bestMove;
   p.do_move(pv[ply++], st);
 
-  // Try to add moves from TT while possible
   while (   (tte = retrieve(p.get_key())) != NULL
          && tte->move() != MOVE_NONE
          && move_is_legal(p, tte->move())
@@ -208,14 +205,3 @@ void TranspositionTable::extract_pv(const Position& pos, Move pv[], const int PL
   }
   pv[ply] = MOVE_NONE;
 }
-
-
-/// TranspositionTable::full() returns the permill of all transposition table
-/// entries which have received at least one write during the current search.
-/// It is used to display the "info hashfull ..." information in UCI.
-
-int TranspositionTable::full() const {
-
-  double N = double(size) * ClusterSize;
-  return int(1000 * (1 - exp(writes * log(1.0 - 1.0/N))));
-}