kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 16:53:09 +00:00
Code Issues Releases Wiki Activity

Retire EvaluatePawnStorms and UseEasyMove constants

Browse source 
Merged from Glaurung 2.2

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2008-12-21 20:10:20 +01:00
parent 61c6a3d5a0
commit 23490bd825
2 changed files with 44 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/pawns.cpp
View file

@ -96,9 +96,6 @@ namespace {
Value(80), Value(180), Value(0), Value( 0) Value(80), Value(180), Value(0), Value( 0)
}; };
// Evaluate pawn storms?
const bool EvaluatePawnStorms = true;
// Pawn storm tables for positions with opposite castling: // Pawn storm tables for positions with opposite castling:
const int QStormTable[64] = { const int QStormTable[64] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -204,7 +201,6 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) {
Bitboard pawns = ourPawns; Bitboard pawns = ourPawns;
// Initialize pawn storm scores by giving bonuses for open files // Initialize pawn storm scores by giving bonuses for open files
if (EvaluatePawnStorms)
for (File f = FILE_A; f <= FILE_H; f++) for (File f = FILE_A; f <= FILE_H; f++)
if (pos.file_is_half_open(us, f)) if (pos.file_is_half_open(us, f))
{ {
@ -230,8 +226,6 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) {
isolated = pos.pawn_is_isolated(us, s); isolated = pos.pawn_is_isolated(us, s);
doubled = pos.pawn_is_doubled(us, s); doubled = pos.pawn_is_doubled(us, s);
if (EvaluatePawnStorms)
{
// We calculate kingside and queenside pawn storm scores // We calculate kingside and queenside pawn storm scores
// for both colors. These are used when evaluating middle // for both colors. These are used when evaluating middle
// game positions with opposite side castling. // game positions with opposite side castling.
@ -246,33 +240,33 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) {
// Kingside and queenside pawn storms // Kingside and queenside pawn storms
int KBonus = KStormTable[relative_square(us, s)]; int KBonus = KStormTable[relative_square(us, s)];
int QBonus = QStormTable[relative_square(us, s)]; int QBonus = QStormTable[relative_square(us, s)];
bool outPost = (KBonus > 0 && (outpost_mask(us, s) & theirPawns)); bool outPostFlag = (KBonus > 0 && (outpost_mask(us, s) & theirPawns));
bool passed = (QBonus > 0 && (passed_pawn_mask(us, s) & theirPawns)); bool passedFlag = (QBonus > 0 && (passed_pawn_mask(us, s) & theirPawns));
switch (f) { switch (f) {
case FILE_A: case FILE_A:
QBonus += passed * QBonus / 2; QBonus += passedFlag * QBonus / 2;
break; break;
case FILE_B: case FILE_B:
QBonus += passed * (QBonus / 2 + QBonus / 4); QBonus += passedFlag * (QBonus / 2 + QBonus / 4);
break; break;
case FILE_C: case FILE_C:
QBonus += passed * QBonus / 2; QBonus += passedFlag * QBonus / 2;
break; break;
case FILE_F: case FILE_F:
KBonus += outPost * KBonus / 4; KBonus += outPostFlag * KBonus / 4;
break; break;
case FILE_G: case FILE_G:
KBonus += outPost * (KBonus / 2 + KBonus / 4); KBonus += outPostFlag * (KBonus / 2 + KBonus / 4);
break; break;
case FILE_H: case FILE_H:
KBonus += outPost * KBonus / 2; KBonus += outPostFlag * KBonus / 2;
break; break;
default: default:
@ -280,7 +274,6 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) {
} }
pi->ksStormValue[us] += KBonus; pi->ksStormValue[us] += KBonus;
pi->qsStormValue[us] += QBonus; pi->qsStormValue[us] += QBonus;
}
// Member of a pawn chain (but not the backward one)? We could speed up // Member of a pawn chain (but not the backward one)? We could speed up
// the test a little by introducing an array of masks indexed by color // the test a little by introducing an array of masks indexed by color

3
src/search.cpp
View file

@ -133,9 +133,6 @@ namespace {
// when the static evaluation is at most IIDMargin below beta. // when the static evaluation is at most IIDMargin below beta.
const Value IIDMargin = Value(0x100); const Value IIDMargin = Value(0x100);
// Use easy moves?
const bool UseEasyMove = true;
// Easy move margin. An easy move candidate must be at least this much // Easy move margin. An easy move candidate must be at least this much
// better than the second best move. // better than the second best move.
const Value EasyMoveMargin = Value(0x200); const Value EasyMoveMargin = Value(0x200);