From 68a1a98c9bd80a4cd720e660bb5aeb81b05c933f Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 6 May 2024 10:50:30 +0100 Subject: [PATCH] messed up the merge whoops --- src/evaluate.cpp | 7 +++---- src/types.h | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 98d3c216..dd0480fa 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -86,10 +86,9 @@ Value Eval::evaluate(const Eval::NNUE::Networks& networks, // 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); - return v; - Value zero = Value(0); - - return zero - v; + Value zero = Value(0); + + return zero - v; } // Like evaluate(), but instead of returning a value, it returns diff --git a/src/types.h b/src/types.h index b49c789b..7e523e25 100644 --- a/src/types.h +++ b/src/types.h @@ -300,13 +300,11 @@ constexpr CastlingRights operator&(Color c, CastlingRights cr) { return CastlingRights((c == WHITE ? WHITE_CASTLING : BLACK_CASTLING) & cr); } -constexpr Value mate_in(int ply) { return VALUE_MATE - ply; } constexpr Value mate_in(int ply) { Value zero = Value(0); return zero - (VALUE_MATE - ply); } -constexpr Value mated_in(int ply) { return -VALUE_MATE + ply; } constexpr Value mated_in(int ply) { Value zero = Value(0); return zero - (-VALUE_MATE + ply);