From b9e09c21ed91a6f3b1a6cb929fa27ee9533b213e Mon Sep 17 00:00:00 2001 From: dhb <1084714805@qq.com> Date: Mon, 29 Jul 2024 23:36:43 +0800 Subject: [PATCH] ablation: no hybrid classical eval test r15 --- Rapfi/eval/eval.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Rapfi/eval/eval.cpp b/Rapfi/eval/eval.cpp index bdf3e9f..a8939b7 100644 --- a/Rapfi/eval/eval.cpp +++ b/Rapfi/eval/eval.cpp @@ -107,20 +107,20 @@ Value evaluate(const Board &board, Value alpha, Value beta) if (board.evaluator()) { // Use evaluator eval if classical eval are in alpha-beta window margin - int margin = classicalEvalMargin(eval); - if (eval >= alpha - margin && eval <= beta + margin) { - ValueType v = board.evaluator()->evaluateValue(board); - - // Adjust draw rate according to draw ratio and draw black win rate - if (Config::EvaluatorDrawRatio < 1.0) { - float newDrawRate = Config::EvaluatorDrawRatio * v.draw(); - float drawWinRate = Config::EvaluatorDrawBlackWinRate; - drawWinRate = self == BLACK ? drawWinRate : 1.0f - drawWinRate; - v = v.valueOfDrawWinRate(drawWinRate, newDrawRate); - } - - return v.value(); + // int margin = classicalEvalMargin(eval); + // if (eval >= alpha - margin && eval <= beta + margin) { + ValueType v = board.evaluator()->evaluateValue(board); + + // Adjust draw rate according to draw ratio and draw black win rate + if (Config::EvaluatorDrawRatio < 1.0) { + float newDrawRate = Config::EvaluatorDrawRatio * v.draw(); + float drawWinRate = Config::EvaluatorDrawBlackWinRate; + drawWinRate = self == BLACK ? drawWinRate : 1.0f - drawWinRate; + v = v.valueOfDrawWinRate(drawWinRate, newDrawRate); } + + return v.value(); + //} } return eval;