X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=59b605eca2665f12b40f4a816d71badc9fa6c449;hp=c29fd5e651a46bd5a46af414b256f2923f6a029d;hb=980124c6094f90741a250a40c160efb593244ffb;hpb=ef8acdc73b7818e97617ba666398be1f9045998e diff --git a/src/evaluate.cpp b/src/evaluate.cpp index c29fd5e6..59b605ec 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -505,6 +505,8 @@ void quit_eval() { { delete PawnTable[i]; delete MaterialTable[i]; + PawnTable[i] = NULL; + MaterialTable[i] = NULL; } } @@ -569,25 +571,25 @@ namespace { ei.egMobility += Sign[us] * EgBonus[Piece][mob]; // Bishop and Knight outposts - if ( (Piece != BISHOP && Piece != KNIGHT) // compile time condition - || !p.square_is_weak(s, them)) - return mob; - - // Initial bonus based on square - Value v, bonus; - v = bonus = OutpostBonus[Piece][relative_square(us, s)]; - - // Increase bonus if supported by pawn, especially if the opponent has - // no minor piece which can exchange the outpost piece - if (v && (p.pawn_attacks(them, s) & p.pawns(us))) + if ( (Piece == BISHOP || Piece == KNIGHT) // compile time condition + && p.square_is_weak(s, them)) { - bonus += v / 2; - if ( p.piece_count(them, KNIGHT) == 0 - && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) - bonus += v; + // Initial bonus based on square + Value v, bonus; + v = bonus = OutpostBonus[Piece][relative_square(us, s)]; + + // Increase bonus if supported by pawn, especially if the opponent has + // no minor piece which can exchange the outpost piece + if (v && (p.pawn_attacks(them, s) & p.pawns(us))) + { + bonus += v / 2; + if ( p.piece_count(them, KNIGHT) == 0 + && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) + bonus += v; + } + ei.mgValue += Sign[us] * bonus; + ei.egValue += Sign[us] * bonus; } - ei.mgValue += Sign[us] * bonus; - ei.egValue += Sign[us] * bonus; return mob; }