X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=9a55fbd88789a5096731061fb66d4109591cf8b6;hp=82bf950c032592afacb9111df4ded445207915f4;hb=877313a413314f8ccca32d96cf3b802a96b52e8a;hpb=896bd917f8e0dc5899b498fc3b62d3ee5e8fd9fe diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 82bf950c..9a55fbd8 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -255,7 +255,7 @@ namespace { bonus += bonus / 2; } - return make_score(bonus, bonus); + return make_score(bonus * 2, bonus / 2); } @@ -498,6 +498,7 @@ namespace { Bitboard b, weakEnemies, protectedEnemies; Score score = SCORE_ZERO; + enum { Minor, Major }; // Protected enemies protectedEnemies = (pos.pieces(Them) ^ pos.pieces(Them,PAWN)) @@ -505,7 +506,7 @@ namespace { & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]); if(protectedEnemies) - score += Threat[0][type_of(pos.piece_on(lsb(protectedEnemies)))]; + score += Threat[Minor][type_of(pos.piece_on(lsb(protectedEnemies)))]; // Enemies not defended by a pawn and under our attack weakEnemies = pos.pieces(Them) @@ -517,11 +518,11 @@ namespace { { b = weakEnemies & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]); if (b) - score += Threat[0][type_of(pos.piece_on(lsb(b)))]; + score += Threat[Minor][type_of(pos.piece_on(lsb(b)))]; b = weakEnemies & (ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN]); if (b) - score += Threat[1][type_of(pos.piece_on(lsb(b)))]; + score += Threat[Major][type_of(pos.piece_on(lsb(b)))]; b = weakEnemies & ~ei.attackedBy[Them][ALL_PIECES]; if (b)