// parameters at 100, which looks prettier.
//
// Values modified by Joona Kiiski
- const int WeightMobilityMidgameInternal = 0x0FA;
- const int WeightMobilityEndgameInternal = 0x10A;
- const int WeightPawnStructureMidgameInternal = 0x0EC;
- const int WeightPawnStructureEndgameInternal = 0x0CD;
- const int WeightPassedPawnsMidgameInternal = 0x108;
- const int WeightPassedPawnsEndgameInternal = 0x109;
- const int WeightKingSafetyInternal = 0x0F7;
- const int WeightKingOppSafetyInternal = 0x101;
- const int WeightSpaceInternal = 0x02F;
+ const int WeightMobilityMidgameInternal = 248;
+ const int WeightMobilityEndgameInternal = 271;
+ const int WeightPawnStructureMidgameInternal = 233;
+ const int WeightPawnStructureEndgameInternal = 201;
+ const int WeightPassedPawnsMidgameInternal = 252;
+ const int WeightPassedPawnsEndgameInternal = 259;
+ const int WeightKingSafetyInternal = 247;
+ const int WeightKingOppSafetyInternal = 259;
+ const int WeightSpaceInternal = 46;
// Mobility and outposts bonus modified by Joona Kiiski
//
const Value UnstoppablePawnValue = Value(0x500);
// Rooks and queens on the 7th rank (modified by Joona Kiiski)
- const Value MidgameRookOn7thBonus = Value(43);
- const Value EndgameRookOn7thBonus = Value(91);
- const Value MidgameQueenOn7thBonus = Value(28);
- const Value EndgameQueenOn7thBonus = Value(53);
+ const Value MidgameRookOn7thBonus = Value(47);
+ const Value EndgameRookOn7thBonus = Value(98);
+ const Value MidgameQueenOn7thBonus = Value(27);
+ const Value EndgameQueenOn7thBonus = Value(54);
// Rooks on open files (modified by Joona Kiiski)
- const Value RookOpenFileBonus = Value(42);
- const Value RookHalfOpenFileBonus = Value(24);
+ const Value RookOpenFileBonus = Value(43);
+ const Value RookHalfOpenFileBonus = Value(19);
// Penalty for rooks trapped inside a friendly king which has lost the
// right to castle.
// Probe the material hash table
ei.mi = MaterialTable[threadID]->get_material_info(pos);
- ei.mgValue += ei.mi->mg_value();
- ei.egValue += ei.mi->eg_value();
+ ei.mgValue += ei.mi->material_value();
+ ei.egValue += ei.mi->material_value();
// If we have a specialized evaluation function for the current material
// configuration, call it and return
WeightKingSafety[us] = weight_option("Cowardice", WeightKingSafetyInternal);
WeightKingSafety[them] = weight_option("Aggressiveness", WeightKingOppSafetyInternal);
+ // If running in analysis mode, make sure we use symmetrical king safety.
+ // We do this by replacing both WeightKingSafety[us] and
+ // WeightKingSafety[them] by their average.
+ if (get_option_value_bool("UCI_AnalyseMode")) {
+ WeightKingSafety[us] = (WeightKingSafety[us] + WeightKingSafety[them]) / 2;
+ WeightKingSafety[them] = WeightKingSafety[us];
+ }
+
WeightSpace = weight_option("Space", WeightSpaceInternal);
init_safety();