X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=a2f7014b02ad37ec678607c22a20c3690dd7a7a3;hp=4e75d376963896250c1a90d2bdb7066f8a4e3c97;hb=5a0581498cde3d0904924d8ef7ed25ea1a2c855a;hpb=5dc23121215039938a9ef4e59ae934312774571c diff --git a/src/value.h b/src/value.h index 4e75d376..a2f7014b 100644 --- a/src/value.h +++ b/src/value.h @@ -7,12 +7,12 @@ 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 . */ @@ -36,7 +36,8 @@ enum ValueType { 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 = 3, // Exact score + VALUE_TYPE_EVAL = 4 // Evaluation cache }; @@ -58,17 +59,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(0x0CC); +const Value PawnValueEndgame = Value(0x101); +const Value KnightValueMidgame = Value(0x332); +const Value KnightValueEndgame = Value(0x34E); +const Value BishopValueMidgame = Value(0x345); +const Value BishopValueEndgame = Value(0x356); +const Value RookValueMidgame = Value(0x4F8); +const Value RookValueEndgame = Value(0x500); +const Value QueenValueMidgame = Value(0x9D5); +const Value QueenValueEndgame = Value(0x9FB); const Value PieceValueMidgame[17] = { Value(0), @@ -92,8 +95,8 @@ const Value PieceValueEndgame[17] = { /// Bonus for having the side to move -const Value TempoValueMidgame = Value(50); -const Value TempoValueEndgame = Value(20); +const Value TempoValueMidgame = Value(48); +const Value TempoValueEndgame = Value(21); //// @@ -121,7 +124,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)); }