Revert "doEvenDeeperSearch + tuning"

This reverts commit 98965c139d.

The increase of depth could lead to search explosions,
most visible with TB.

fixes https://github.com/official-stockfish/Stockfish/issues/4276
closes https://github.com/official-stockfish/Stockfish/pull/4256

Bench: 3872306
This commit is contained in:
Joost VandeVondele
2022-12-12 08:12:10 +01:00
parent 8f817ef082
commit 955edf1d1d
2 changed files with 10 additions and 11 deletions
+7 -7
View File
@@ -1063,7 +1063,7 @@ Value Eval::evaluate(const Position& pos, int* complexity) {
else
{
int nnueComplexity;
int scale = 1076 + 96 * pos.non_pawn_material() / 5120;
int scale = 1064 + 106 * pos.non_pawn_material() / 5120;
Color stm = pos.side_to_move();
Value optimism = pos.this_thread()->optimism[stm];
@@ -1071,21 +1071,21 @@ Value Eval::evaluate(const Position& pos, int* complexity) {
Value nnue = NNUE::evaluate(pos, true, &nnueComplexity);
// Blend nnue complexity with (semi)classical complexity
nnueComplexity = ( 412 * nnueComplexity
+ 428 * abs(psq - nnue)
nnueComplexity = ( 416 * nnueComplexity
+ 424 * abs(psq - nnue)
+ (optimism > 0 ? int(optimism) * int(psq - nnue) : 0)
) / 1026;
) / 1024;
// Return hybrid NNUE complexity to caller
if (complexity)
*complexity = nnueComplexity;
optimism = optimism * (278 + nnueComplexity) / 256;
v = (nnue * scale + optimism * (scale - 755)) / 1024;
optimism = optimism * (269 + nnueComplexity) / 256;
v = (nnue * scale + optimism * (scale - 754)) / 1024;
}
// Damp down the evaluation linearly when shuffling
v = v * (197 - pos.rule50_count()) / 214;
v = v * (195 - pos.rule50_count()) / 211;
// Guarantee evaluation does not hit the tablebase range
v = std::clamp(v, VALUE_TB_LOSS_IN_MAX_PLY + 1, VALUE_TB_WIN_IN_MAX_PLY - 1);