Remove pointless tte->static_value() != VALUE_NONE checks

[stockfish] / src / tt.cpp

diff --git a/src/tt.cpp b/src/tt.cpp
index fc0bdfb47c1c96f1738c8403795640fbf13056f8..d2f983c9f014cba76d250092a8f0e9f06c60dc04 100644 (file)
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -23,9 +23,9 @@
 ////
 
 #include <cassert>
-#include <cmath>
 #include <cstring>
 
+#include "evaluate.h"
 #include "movegen.h"
 #include "tt.h"
 
@@ -38,7 +38,7 @@ TranspositionTable TT;
 
 TranspositionTable::TranspositionTable() {
 
-  size = writes = 0;
+  size = 0;
   entries = 0;
   generation = 0;
 }
@@ -72,7 +72,6 @@ void TranspositionTable::set_size(size_t mbSize) {
                     << " MB for transposition table." << std::endl;
           Application::exit_with_failure();
       }
-      clear();
   }
 }
 
@@ -100,6 +99,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 +115,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 +153,7 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const {
 /// entries from the current search.
 
 void TranspositionTable::new_search() {
-
   generation++;
-  writes = 0;
 }
 
 
@@ -167,36 +165,41 @@ void TranspositionTable::new_search() {
 void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
 
   StateInfo st;
+  EvalInfo ei;
+  Value v;
   Position p(pos, pos.thread());
 
   for (int i = 0; pv[i] != MOVE_NONE; i++)
   {
       TTEntry *tte = retrieve(p.get_key());
       if (!tte || tte->move() != pv[i])
-          store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i], VALUE_NONE, VALUE_NONE);
+      {
+          v = (p.is_check() ? VALUE_NONE : evaluate(p, ei));
+          store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[i], v, ei.kingDanger[pos.side_to_move()]);
+      }
       p.do_move(pv[i], st);
   }
 }
 
 
-/// 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;
 
-  // Update position to the end of current PV
-  while (pv[ply] != MOVE_NONE)
-      p.do_move(pv[ply++], st);
+  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 +211,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))));
-}