Move insert_pv() and extract_pv() out of TT class

[stockfish] / src / tt.cpp

diff --git a/src/tt.cpp b/src/tt.cpp
index 57dd00790e816670cea1bdfbfea870896492dce5..956184a92576089b14ced36fdd57285babaa944a 100644 (file)
--- a/src/tt.cpp
+++ b/src/tt.cpp
@@ -23,10 +23,9 @@
 ////
 
 #include <cassert>
-#include <cmath>
 #include <cstring>
 
-#include "movegen.h"
+#include "evaluate.h"
 #include "tt.h"
 
 // The main transposition table
@@ -38,7 +37,7 @@ TranspositionTable TT;
 
 TranspositionTable::TranspositionTable() {
 
-  size = overwrites = 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();
   }
 }
 
@@ -128,7 +126,6 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d,
           replace = tte;
   }
   replace->save(posKey32, v, t, d, m, generation, statV, kingD);
-  overwrites++;
 }
 
 
@@ -155,72 +152,5 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const {
 /// entries from the current search.
 
 void TranspositionTable::new_search() {
-
   generation++;
-  overwrites = 0;
-}
-
-
-/// TranspositionTable::insert_pv() is called at the end of a search
-/// iteration, and inserts the PV back into the PV. This makes sure
-/// the old PV moves are searched first, even if the old TT entries
-/// have been overwritten.
-
-void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
-
-  StateInfo st;
-  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);
-      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.
-
-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(bestMove != MOVE_NONE);
-
-  pv[ply] = bestMove;
-  p.do_move(pv[ply++], st);
-
-  // Extract moves from TT when possible. We try hard to always
-  // get a ponder move, that's the reason of ply < 2 conditions.
-  while (   (tte = retrieve(p.get_key())) != NULL
-         && tte->move() != MOVE_NONE
-         && (tte->type() == VALUE_TYPE_EXACT || ply < 2)
-         && move_is_legal(p, tte->move())
-         && (!p.is_draw() || ply < 2)
-         && ply < PLY_MAX)
-  {
-      pv[ply] = tte->move();
-      p.do_move(pv[ply++], st);
-  }
-  pv[ply] = MOVE_NONE;
-}
-
-
-/// TranspositionTable::full() returns the permill of all transposition table
-/// entries which have received at least one overwrite 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(overwrites * log(1.0 - 1.0/N))));
 }