From a952c6bc6d64ba4c9fe4f0952896a9fd6e63b4a9 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Thu, 19 Aug 2010 17:25:08 +0100 Subject: [PATCH 1/1] Retire is_upper_bound() and friend Directly expand in the few places where is called. No functional change. Signed-off-by: Marco Costalba --- src/search.cpp | 10 +++++----- src/value.h | 8 -------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 59025fba..a54fa817 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -1179,7 +1179,7 @@ namespace { && tte && tte->move() && !excludedMove // Do not allow recursive singular extension search - && is_lower_bound(tte->type()) + && (tte->type() & VALUE_TYPE_LOWER) && tte->depth() >= depth - 3 * ONE_PLY; // Step 10. Loop through moves @@ -1957,8 +1957,8 @@ namespace { || v >= Max(value_mate_in(PLY_MAX), beta) || v < Min(value_mated_in(PLY_MAX), beta)) - && ( (is_lower_bound(tte->type()) && v >= beta) - || (is_upper_bound(tte->type()) && v < beta)); + && ( ((tte->type() & VALUE_TYPE_LOWER) && v >= beta) + || ((tte->type() & VALUE_TYPE_UPPER) && v < beta)); } @@ -1971,8 +1971,8 @@ namespace { Value v = value_from_tt(tte->value(), ply); - if ( (is_lower_bound(tte->type()) && v >= defaultEval) - || (is_upper_bound(tte->type()) && v < defaultEval)) + if ( ((tte->type() & VALUE_TYPE_LOWER) && v >= defaultEval) + || ((tte->type() & VALUE_TYPE_UPPER) && v < defaultEval)) return v; return defaultEval; diff --git a/src/value.h b/src/value.h index f4db35e5..cb545d61 100644 --- a/src/value.h +++ b/src/value.h @@ -163,12 +163,4 @@ inline Value value_mated_in(int ply) { return -VALUE_MATE + ply; } -inline int is_upper_bound(ValueType vt) { - return vt & VALUE_TYPE_UPPER; -} - -inline int is_lower_bound(ValueType vt) { - return vt & VALUE_TYPE_LOWER; -} - #endif // !defined(VALUE_H_INCLUDED) -- 2.39.2