X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftt.cpp;h=010bdc954e60b0b0a438fdf2bdc417b3a65c0cef;hp=e140a0ba10ec5fa2183b506b68750a4dcbc39289;hb=6fe36d13de0ec25a8d35ca256dacee8b854856be;hpb=fd12e8cb239180607559bb805e233f7ea704a67c diff --git a/src/tt.cpp b/src/tt.cpp index e140a0ba..010bdc95 100644 --- a/src/tt.cpp +++ b/src/tt.cpp @@ -53,11 +53,9 @@ TranspositionTable::~TranspositionTable() { /// TranspositionTable::set_size sets the size of the transposition table, /// measured in megabytes. -void TranspositionTable::set_size(unsigned mbSize) { +void TranspositionTable::set_size(size_t mbSize) { - assert(mbSize >= 4 && mbSize <= 4096); - - unsigned newSize = 1024; + size_t newSize = 1024; // We store a cluster of ClusterSize number of TTEntry for each position // and newSize is the maximum number of storable positions. @@ -121,8 +119,8 @@ void TranspositionTable::store(const Key posKey, Value v, ValueType t, Depth d, { if (!tte->key() || tte->key() == posKey32) // empty or overwrite old { - // Do not overwrite when new type is VALUE_TYPE_EVAL - if (tte->key() && t == VALUE_TYPE_EVAL) + // Do not overwrite when new type is VALUE_TYPE_EV_LO + if (tte->key() && t == VALUE_TYPE_EV_LO) return; if (m == MOVE_NONE) @@ -208,7 +206,9 @@ void TranspositionTable::insert_pv(const Position& pos, Move pv[]) { for (int i = 0; pv[i] != MOVE_NONE; i++) { - store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, Depth(-127*OnePly), pv[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]); p.do_move(pv[i], st); } } @@ -220,27 +220,26 @@ void TranspositionTable::insert_pv(const Position& pos, Move pv[]) { /// 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 pv[]) { - - int ply; - Position p(pos); - StateInfo st[100]; - - for (ply = 0; pv[ply] != MOVE_NONE; ply++) - p.do_move(pv[ply], st[ply]); +void TranspositionTable::extract_pv(const Position& pos, Move pv[], const int PLY_MAX) { - bool stop; const TTEntry* tte; - for (stop = false, tte = retrieve(p.get_key()); - tte && tte->move() != MOVE_NONE && !stop; - tte = retrieve(p.get_key()), ply++) + StateInfo st; + Position p(pos); + int ply = 0; + + // Update position to the end of current PV + while (pv[ply] != MOVE_NONE) + 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()) + && (!p.is_draw() || ply < 2) + && ply < PLY_MAX) { - if (!move_is_legal(p, tte->move())) - break; pv[ply] = tte->move(); - p.do_move(pv[ply], st[ply]); - for (int j = 0; j < ply; j++) - if (st[j].key == p.get_key()) stop = true; + p.do_move(pv[ply++], st); } pv[ply] = MOVE_NONE; }