From: Marco Costalba Date: Tue, 27 Apr 2010 05:17:32 +0000 (+0100) Subject: Endgame's apply() method can be 'const' X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=83631c89cec7f1afd8b97a3e676cd0c12a4e8633;hp=bedf80a4c01ec5d265fc65114592761d37eeb85c;ds=inline Endgame's apply() method can be 'const' No functional change. Signed-off-by: Marco Costalba --- diff --git a/src/endgame.cpp b/src/endgame.cpp index 1e766e28..f59456bd 100644 --- a/src/endgame.cpp +++ b/src/endgame.cpp @@ -104,7 +104,7 @@ namespace { /// attacking side a bonus for driving the defending king towards the edge /// of the board, and for keeping the distance between the two kings small. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(weakerSide) == Value(0)); assert(pos.piece_count(weakerSide, PAWN) == Value(0)); @@ -130,7 +130,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// Mate with KBN vs K. This is similar to KX vs K, but we have to drive the /// defending king towards a corner square of the right color. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(weakerSide) == Value(0)); assert(pos.piece_count(weakerSide, PAWN) == Value(0)); @@ -159,7 +159,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// KP vs K. This endgame is evaluated with the help of a bitbase. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == Value(0)); assert(pos.non_pawn_material(weakerSide) == Value(0)); @@ -207,7 +207,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// far advanced with support of the king, while the attacking king is far /// away. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == RookValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 0); @@ -264,7 +264,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// KR vs KB. This is very simple, and always returns drawish scores. The /// score is slightly bigger when the defending king is close to the edge. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == RookValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 0); @@ -280,7 +280,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// KR vs KN. The attacking side has slightly better winning chances than /// in KR vs KB, particularly if the king and the knight are far apart. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == RookValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 0); @@ -304,7 +304,7 @@ Value EvaluationFunction::apply(const Position& pos) { /// for the defending side in the search, this is usually sufficient to be /// able to win KQ vs KR. template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == QueenValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 0); @@ -323,7 +323,7 @@ Value EvaluationFunction::apply(const Position& pos) { } template<> -Value EvaluationFunction::apply(const Position& pos) { +Value EvaluationFunction::apply(const Position& pos) const { assert(pos.piece_count(strongerSide, BISHOP) == 2); assert(pos.non_pawn_material(strongerSide) == 2*BishopValueMidgame); @@ -352,12 +352,12 @@ Value EvaluationFunction::apply(const Position& pos) { /// K and two minors vs K and one or two minors or K and two knights against /// king alone are always draw. template<> -Value EvaluationFunction::apply(const Position&) { +Value EvaluationFunction::apply(const Position&) const { return Value(0); } template<> -Value EvaluationFunction::apply(const Position&) { +Value EvaluationFunction::apply(const Position&) const { return Value(0); } @@ -367,7 +367,7 @@ Value EvaluationFunction::apply(const Position&) { /// returned. If not, the return value is SCALE_FACTOR_NONE, i.e. no scaling /// will be used. template<> -ScaleFactor ScalingFunction::apply(const Position& pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == BishopValueMidgame); assert(pos.piece_count(strongerSide, BISHOP) == 1); @@ -421,7 +421,7 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { /// It tests for fortress draws with a rook on the third rank defended by /// a pawn. template<> -ScaleFactor ScalingFunction::apply(const Position& pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == QueenValueMidgame); assert(pos.piece_count(strongerSide, QUEEN) == 1); @@ -452,7 +452,7 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { /// It would also be nice to rewrite the actual code for this function, /// which is mostly copied from Glaurung 1.x, and not very pretty. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == RookValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 1); @@ -570,7 +570,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// single pattern: If the stronger side has no pawns and the defending king /// is actively placed, the position is drawish. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == RookValueMidgame); assert(pos.piece_count(strongerSide, PAWN) == 2); @@ -609,7 +609,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// against king. There is just a single rule here: If all pawns are on /// the same rook file and are blocked by the defending king, it's a draw. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == Value(0)); assert(pos.piece_count(strongerSide, PAWN) >= 2); @@ -655,7 +655,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// it's a draw. If the two bishops have opposite color, it's almost always /// a draw. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == BishopValueMidgame); assert(pos.piece_count(strongerSide, BISHOP) == 1); @@ -708,7 +708,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// KBPPKBScalingFunction scales KBPP vs KB endgames. It detects a few basic /// draws with opposite-colored bishops. template<> -ScaleFactor ScalingFunction::apply(const Position& pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == BishopValueMidgame); assert(pos.piece_count(strongerSide, BISHOP) == 1); @@ -784,7 +784,7 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { /// square of the king is not of the same color as the stronger side's bishop, /// it's a draw. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == BishopValueMidgame); assert(pos.piece_count(strongerSide, BISHOP) == 1); @@ -811,7 +811,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// If the pawn is a rook pawn on the 7th rank and the defending king prevents /// the pawn from advancing, the position is drawn. template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == KnightValueMidgame); assert(pos.piece_count(strongerSide, KNIGHT) == 1); @@ -841,7 +841,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { /// advanced and not on a rook file; in this case it is often possible to win /// (e.g. 8/4k3/3p4/3P4/6K1/8/8/8 w - - 0 1). template<> -ScaleFactor ScalingFunction::apply(const Position &pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) const { assert(pos.non_pawn_material(strongerSide) == Value(0)); assert(pos.non_pawn_material(weakerSide) == Value(0)); diff --git a/src/endgame.h b/src/endgame.h index 7ea4a138..b8fb7e82 100644 --- a/src/endgame.h +++ b/src/endgame.h @@ -68,7 +68,7 @@ class EndgameFunctionBase { public: EndgameFunctionBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {} virtual ~EndgameFunctionBase() {} - virtual T apply(const Position&) = 0; + virtual T apply(const Position&) const = 0; Color color() const { return strongerSide; } protected: @@ -85,14 +85,14 @@ template struct EvaluationFunction : public EndgameEvaluationFunctionBase { typedef EndgameEvaluationFunctionBase Base; explicit EvaluationFunction(Color c): EndgameEvaluationFunctionBase(c) {} - Value apply(const Position&); + Value apply(const Position&) const; }; template struct ScalingFunction : public EndgameScalingFunctionBase { typedef EndgameScalingFunctionBase Base; explicit ScalingFunction(Color c) : EndgameScalingFunctionBase(c) {} - ScaleFactor apply(const Position&); + ScaleFactor apply(const Position&) const; };