kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-02 01:29:36 +00:00
Code Issues Releases Wiki Activity

Further cleanup evaluate()

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2008-09-24 19:20:52 +01:00
parent f56af8e84d
commit 34ca22486a
1 changed files with 46 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/evaluate.cpp
View file

@ -1046,26 +1046,20 @@ namespace {
void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us,
EvalInfo &ei) { EvalInfo &ei) {
Piece pawn = pawn_of_color(opposite_color(us));
Square b6, b8;
assert(square_is_ok(s)); assert(square_is_ok(s));
assert(pos.piece_on(s) == bishop_of_color(us)); assert(pos.piece_on(s) == bishop_of_color(us));
if(square_file(s) == FILE_A) { Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6);
b6 = relative_square(us, SQ_B6); Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8);
b8 = relative_square(us, SQ_B8);
}
else {
b6 = relative_square(us, SQ_G6);
b8 = relative_square(us, SQ_G8);
}
if(pos.piece_on(b6) == pawn && pos.see(s, b6) < 0 && pos.see(s, b8) < 0) { if ( pos.piece_on(b6) == pawn_of_color(opposite_color(us))
&& pos.see(s, b6) < 0
&& pos.see(s, b8) < 0)
{
ei.mgValue -= Sign[us] * TrappedBishopA7H7Penalty; ei.mgValue -= Sign[us] * TrappedBishopA7H7Penalty;
ei.egValue -= Sign[us] * TrappedBishopA7H7Penalty; ei.egValue -= Sign[us] * TrappedBishopA7H7Penalty;
} }
} }
@ -1123,21 +1117,20 @@ namespace {
// ScaleFactor array. // ScaleFactor array.
Value scale_by_game_phase(Value mv, Value ev, Phase ph, ScaleFactor sf[]) { Value scale_by_game_phase(Value mv, Value ev, Phase ph, ScaleFactor sf[]) {
assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE); assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE);
assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE); assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE);
assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME);
if(ev > Value(0)) ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]);
ev = apply_scale_factor(ev, sf[WHITE]);
else
ev = apply_scale_factor(ev, sf[BLACK]);
// Superlinear interpolator // Linearized sigmoid interpolator
int sli_ph = int(ph); int sph = int(ph);
sli_ph -= (64 - sli_ph) / 4; sph -= (64 - sph) / 4;
sli_ph = Min(PHASE_MIDGAME, Max(PHASE_ENDGAME, sli_ph)); // ceiling sph = Min(PHASE_MIDGAME, Max(PHASE_ENDGAME, sph));
Value result = Value(int((mv * sph + ev * (128 - sph)) / 128));
Value result = Value(int((mv * sli_ph + ev * (128 - sli_ph)) / 128));
return Value(int(result) & ~(GrainSize - 1)); return Value(int(result) & ~(GrainSize - 1));
} }
@ -1164,8 +1157,6 @@ namespace {
// parameters. It is called from read_weights(). // parameters. It is called from read_weights().
void init_safety() { void init_safety() {
double a, b;
int maxSlope, peak, i, j;
QueenContactCheckBonus = get_option_value_int("Queen Contact Check Bonus"); QueenContactCheckBonus = get_option_value_int("Queen Contact Check Bonus");
RookContactCheckBonus = get_option_value_int("Rook Contact Check Bonus"); RookContactCheckBonus = get_option_value_int("Rook Contact Check Bonus");
@ -1176,27 +1167,32 @@ namespace {
DiscoveredCheckBonus = get_option_value_int("Discovered Check Bonus"); DiscoveredCheckBonus = get_option_value_int("Discovered Check Bonus");
MateThreatBonus = get_option_value_int("Mate Threat Bonus"); MateThreatBonus = get_option_value_int("Mate Threat Bonus");
a = get_option_value_int("King Safety Coefficient") / 100.0; int maxSlope = get_option_value_int("King Safety Max Slope");
b = get_option_value_int("King Safety X Intercept") * 1.0; int peak = get_option_value_int("King Safety Max Value") * 256 / 100;
maxSlope = get_option_value_int("King Safety Max Slope"); double a = get_option_value_int("King Safety Coefficient") / 100.0;
peak = (get_option_value_int("King Safety Max Value") * 256) / 100; double b = get_option_value_int("King Safety X Intercept");
bool quad = (get_option_value_string("King Safety Curve") == "Quadratic");
bool linear = (get_option_value_string("King Safety Curve") == "Linear");
for(i = 0; i < 100; i++) { for (int i = 0; i < 100; i++)
if(i < b) SafetyTable[i] = Value(0); {
else if(get_option_value_string("King Safety Curve") == "Quadratic") if (i < b)
SafetyTable[i] = Value(0);
else if(quad)
SafetyTable[i] = Value((int)(a * (i - b) * (i - b))); SafetyTable[i] = Value((int)(a * (i - b) * (i - b)));
else if(get_option_value_string("King Safety Curve") == "Linear") else if(linear)
SafetyTable[i] = Value((int)(100 * a * (i - b))); SafetyTable[i] = Value((int)(100 * a * (i - b)));
} }
for(i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
if(SafetyTable[i+1] - SafetyTable[i] > maxSlope) { {
for(j = i + 1; j < 100; j++) if (SafetyTable[i+1] - SafetyTable[i] > maxSlope)
for (int j = i + 1; j < 100; j++)
SafetyTable[j] = SafetyTable[j-1] + Value(maxSlope); SafetyTable[j] = SafetyTable[j-1] + Value(maxSlope);
}
for(i = 0; i < 100; i++)
if (SafetyTable[i] > Value(peak)) if (SafetyTable[i] > Value(peak))
SafetyTable[i] = Value(peak); SafetyTable[i] = Value(peak);
} }
}
} }