Merge remote-tracking branch 'official-stockfish/master'

absimaldata · absimaldata · commit d926b8912d05 · 2015-09-19T00:09:31.000+05:30
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -796,6 +796,11 @@ Value Eval::evaluate(const Position& pos) {
           sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(56) : ScaleFactor(38);
   }
 
+  // Scale endgame by number of pawns
+  int p = pos.count<PAWN>(WHITE) + pos.count<PAWN>(BLACK);
+  int v_eg = 1 + abs(int(eg_value(score)));
+  sf = ScaleFactor(std::max(sf / 2, sf - 7 * SCALE_FACTOR_NORMAL * (14 - p) / v_eg));
+
   // Interpolate between a middlegame and a (scaled by 'sf') endgame score
   Value v =  mg_value(score) * int(me->game_phase())
            + eg_value(score) * int(PHASE_MIDGAME - me->game_phase()) * sf / SCALE_FACTOR_NORMAL;
diff --git a/src/tt.cpp b/src/tt.cpp
@@ -78,7 +78,7 @@ TTEntry* TranspositionTable::probe(const Key key, bool& found) const {
   for (int i = 0; i < ClusterSize; ++i)
       if (!tte[i].key16 || tte[i].key16 == key16)
       {
-          if (tte[i].key16)
+          if ((tte[i].genBound8 & 0xFC) != generation8 && tte[i].key16)
               tte[i].genBound8 = uint8_t(generation8 | tte[i].bound()); // Refresh
 
           return found = (bool)tte[i].key16, &tte[i];
diff --git a/src/tt.h b/src/tt.h
@@ -50,7 +50,7 @@ struct TTEntry {
     // Don't overwrite more valuable entries
     if (  (k >> 48) != key16
         || d > depth8 - 2
-        || g != (genBound8 & 0xFC)
+     /* || g != (genBound8 & 0xFC) // Any matching keys are already refreshed by probe() */
         || b == BOUND_EXACT)
     {
         key16     = (uint16_t)(k >> 48);

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ TTEntry* TranspositionTable::probe(const Key key, bool& found) const {`
`78`	`78`	`for (int i = 0; i < ClusterSize; ++i)`
`79`	`79`	`if (!tte[i].key16 \|\| tte[i].key16 == key16)`
`80`	`80`	`{`
`81`		`- if (tte[i].key16)`
	`81`	`+ if ((tte[i].genBound8 & 0xFC) != generation8 && tte[i].key16)`
`82`	`82`	`tte[i].genBound8 = uint8_t(generation8 \| tte[i].bound()); // Refresh`
`83`	`83`
`84`	`84`	`return found = (bool)tte[i].key16, &tte[i];`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ struct TTEntry {`
`50`	`50`	`// Don't overwrite more valuable entries`
`51`	`51`	`if ( (k >> 48) != key16`
`52`	`52`	`\|\| d > depth8 - 2`
`53`		`- \|\| g != (genBound8 & 0xFC)`
	`53`	`+ /* \|\| g != (genBound8 & 0xFC) // Any matching keys are already refreshed by probe() */`
`54`	`54`	`\|\| b == BOUND_EXACT)`
`55`	`55`	`{`
`56`	`56`	`key16 = (uint16_t)(k >> 48);`