X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=923a55e83f5b3f6b5e057fa89c6258ede5b14bf1;hp=345526b625eaf3e3118d37f0e06e54476f6fd17c;hb=efeb37c33f15a903dbe5706529a7a26511e9ca58;hpb=5bed82cd4e34c329bd08c57963ccc93c15ca0f05 diff --git a/src/value.h b/src/value.h index 345526b6..923a55e8 100644 --- a/src/value.h +++ b/src/value.h @@ -21,13 +21,6 @@ #if !defined(VALUE_H_INCLUDED) #define VALUE_H_INCLUDED -//// -//// Includes -//// - -#include "piece.h" - - //// //// Types //// @@ -99,54 +92,6 @@ inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_v inline Score operator*(Score s1, Score s2); -//// -//// Constants and variables -//// - -/// Piece values, middle game and endgame - -/// Important: If the material values are changed, one must also -/// adjust the piece square tables, and the method game_phase() in the -/// Position class! -/// -/// 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_ZERO, - PawnValueMidgame, KnightValueMidgame, BishopValueMidgame, - RookValueMidgame, QueenValueMidgame, - VALUE_ZERO, VALUE_ZERO, VALUE_ZERO, - PawnValueMidgame, KnightValueMidgame, BishopValueMidgame, - RookValueMidgame, QueenValueMidgame, - VALUE_ZERO, VALUE_ZERO, VALUE_ZERO -}; - -const Value PieceValueEndgame[17] = { - VALUE_ZERO, - PawnValueEndgame, KnightValueEndgame, BishopValueEndgame, - RookValueEndgame, QueenValueEndgame, - VALUE_ZERO, VALUE_ZERO, VALUE_ZERO, - PawnValueEndgame, KnightValueEndgame, BishopValueEndgame, - RookValueEndgame, QueenValueEndgame, - VALUE_ZERO, VALUE_ZERO, VALUE_ZERO -}; - -/// Bonus for having the side to move (modified by Joona Kiiski) - -const Score TempoValue = make_score(48, 22); - - //// //// Inline functions //// @@ -163,28 +108,4 @@ inline Value value_mated_in(int ply) { return -VALUE_MATE + ply; } -inline bool is_upper_bound(ValueType vt) { - return (int(vt) & int(VALUE_TYPE_UPPER)) != 0; -} - -inline bool is_lower_bound(ValueType vt) { - return (int(vt) & int(VALUE_TYPE_LOWER)) != 0; -} - -inline Value piece_value_midgame(PieceType pt) { - return PieceValueMidgame[pt]; -} - -inline Value piece_value_endgame(PieceType pt) { - return PieceValueEndgame[pt]; -} - -inline Value piece_value_midgame(Piece p) { - return PieceValueMidgame[p]; -} - -inline Value piece_value_endgame(Piece p) { - return PieceValueEndgame[p]; -} - #endif // !defined(VALUE_H_INCLUDED)