Retire is_upper_bound() and friend

Directly expand in the few places where is called.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/search.cpp b/src/search.cpp
index 59025fba1215d78525890a6e56b44251281bbf0a..a54fa8171dd3f0787a85ce0fd1e8a270747c20ff 100644 (file)
--- 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 f4db35e5d2a9583c517f4624ddf503e22918ecc1..cb545d611ba0b42016a05658614855a70e7222dd 100644 (file)
--- 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)