X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=788fb3a88445e578039fd811486ab11a499525c1;hp=4e75d376963896250c1a90d2bdb7066f8a4e3c97;hb=bc0c1c8d7b1ef10bb917f3da8b5ba272ee6401fc;hpb=5dc23121215039938a9ef4e59ae934312774571c diff --git a/src/value.h b/src/value.h index 4e75d376..788fb3a8 100644 --- a/src/value.h +++ b/src/value.h @@ -1,18 +1,18 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -33,10 +33,10 @@ //// enum ValueType { - VALUE_TYPE_NONE = 0, + VALUE_TYPE_NONE = 0, VALUE_TYPE_UPPER = 1, // Upper bound VALUE_TYPE_LOWER = 2, // Lower bound - VALUE_TYPE_EXACT = 3 // Exact score + VALUE_TYPE_EXACT = VALUE_TYPE_UPPER | VALUE_TYPE_LOWER }; @@ -45,10 +45,49 @@ enum Value { VALUE_KNOWN_WIN = 15000, VALUE_MATE = 30000, VALUE_INFINITE = 30001, - VALUE_NONE = 30002 + VALUE_NONE = 30002, + VALUE_ENSURE_SIGNED = -1 }; +/// Score enum keeps a midgame and an endgame value in a single +/// integer (enum), first LSB 16 bits are used to store endgame +/// value, while upper bits are used for midgame value. + +// Compiler is free to choose the enum type as long as can keep +// its data, so ensure Score to be an integer type. +enum Score { ENSURE_32_BITS_SIZE_P = (1 << 16), ENSURE_32_BITS_SIZE_N = -(1 << 16)}; + +// Extracting the _signed_ lower and upper 16 bits it not so trivial +// because according to the standard a simple cast to short is +// implementation defined and so is a right shift of a signed integer. +inline Value mg_value(Score s) { return Value(((int(s) + 32768) & ~0xffff) / 0x10000); } + +// Unfortunatly on Intel 64 bit we have a small speed regression, so use a faster code in +// this case, although not 100% standard compliant it seems to work for Intel and MSVC. +#if defined(IS_64BIT) && (!defined(__GNUC__) || defined(__INTEL_COMPILER)) +inline Value eg_value(Score s) { return Value(int16_t(s & 0xffff)); } +#else +inline Value eg_value(Score s) { return Value((int)(unsigned(s) & 0x7fffu) - (int)(unsigned(s) & 0x8000u)); } +#endif + +inline Score make_score(int mg, int eg) { return Score((mg << 16) + eg); } + +inline Score operator-(Score s) { return Score(-int(s)); } +inline Score operator+(Score s1, Score s2) { return Score(int(s1) + int(s2)); } +inline Score operator-(Score s1, Score s2) { return Score(int(s1) - int(s2)); } +inline void operator+=(Score& s1, Score s2) { s1 = Score(int(s1) + int(s2)); } +inline void operator-=(Score& s1, Score s2) { s1 = Score(int(s1) - int(s2)); } +inline Score operator*(int i, Score s) { return Score(i * int(s)); } + +// Division must be handled separately for each term +inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_value(s) / i); } + +// Only declared but not defined. We don't want to multiply two scores due to +// a very high risk of overflow. So user should explicitly convert to integer. +inline Score operator*(Score s1, Score s2); + + //// //// Constants and variables //// @@ -58,17 +97,19 @@ enum Value { /// Important: If the material values are changed, one must also /// adjust the piece square tables, and the method game_phase() in the /// Position class! - -const Value PawnValueMidgame = Value(0xCC); -const Value PawnValueEndgame = Value(0x100); -const Value KnightValueMidgame = Value(0x340); -const Value KnightValueEndgame = Value(0x340); -const Value BishopValueMidgame = Value(0x340); -const Value BishopValueEndgame = Value(0x340); -const Value RookValueMidgame = Value(0x505); -const Value RookValueEndgame = Value(0x505); -const Value QueenValueMidgame = Value(0xA00); -const Value QueenValueEndgame = Value(0xA00); +/// +/// Values modified by Joona Kiiski + +const Value PawnValueMidgame = Value(0x0C6); +const Value PawnValueEndgame = Value(0x102); +const Value KnightValueMidgame = Value(0x331); +const Value KnightValueEndgame = Value(0x34E); +const Value BishopValueMidgame = Value(0x344); +const Value BishopValueEndgame = Value(0x359); +const Value RookValueMidgame = Value(0x4F6); +const Value RookValueEndgame = Value(0x4FE); +const Value QueenValueMidgame = Value(0x9D9); +const Value QueenValueEndgame = Value(0x9FE); const Value PieceValueMidgame[17] = { Value(0), @@ -90,10 +131,9 @@ const Value PieceValueEndgame[17] = { Value(0), Value(0), Value(0) }; -/// Bonus for having the side to move +/// Bonus for having the side to move (modified by Joona Kiiski) -const Value TempoValueMidgame = Value(50); -const Value TempoValueEndgame = Value(20); +const Score TempoValue = make_score(48, 22); //// @@ -121,7 +161,7 @@ inline void operator/= (Value &v, int i) { v = Value(int(v) / i); } inline Value value_mate_in(int ply) { return Value(VALUE_MATE - Value(ply)); } - + inline Value value_mated_in(int ply) { return Value(-VALUE_MATE + Value(ply)); } @@ -150,16 +190,4 @@ inline Value piece_value_endgame(Piece p) { return PieceValueEndgame[p]; } - -//// -//// Prototypes -//// - -extern Value value_to_tt(Value v, int ply); -extern Value value_from_tt(Value v, int ply); -extern int value_to_centipawns(Value v); -extern Value value_from_centipawns(int cp); -extern const std::string value_to_string(Value v); - - #endif // !defined(VALUE_H_INCLUDED)