From d73eea3f719aaa2867917155bd41b10a04958658 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Tue, 24 Aug 2010 15:35:13 +0200 Subject: [PATCH] There is no need of storing mobility in EvalInfo No functional change. Signed-off-by: Marco Costalba --- src/evaluate.cpp | 36 ++++++++++++++++++++---------------- src/evaluate.h | 3 --- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index eb4cbef7..9c960409 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -194,7 +194,7 @@ namespace { void init_attack_tables(const Position& pos, EvalInfo& ei); template - void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei); + Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei); template void evaluate_king(const Position& pos, EvalInfo& ei); @@ -242,6 +242,7 @@ template Value do_evaluate(const Position& pos, EvalInfo& ei) { ScaleFactor factor[2]; + Score mobility; assert(pos.is_ok()); assert(pos.thread() >= 0 && pos.thread() < MAX_THREADS); @@ -250,7 +251,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { memset(&ei, 0, sizeof(EvalInfo)); // Initialize by reading the incrementally updated scores included in the - // position object (material + piece square tables) + // position object (material + piece square tables). ei.value = pos.value(); // Probe the material hash table @@ -258,7 +259,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { ei.value += ei.mi->material_value(); // If we have a specialized evaluation function for the current material - // configuration, call it and return + // configuration, call it and return. if (ei.mi->specialized_eval_exists()) return ei.mi->evaluate(pos); @@ -274,9 +275,10 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { init_attack_tables(pos, ei); init_attack_tables(pos, ei); - // Evaluate pieces - evaluate_pieces_of_color(pos, ei); - evaluate_pieces_of_color(pos, ei); + // Evaluate pieces and mobility + mobility = evaluate_pieces_of_color(pos, ei) + - evaluate_pieces_of_color(pos, ei); + ei.value += apply_weight(mobility, Weights[Mobility]); // Kings. Kings are evaluated after all other pieces for both sides, // because we need complete attack information for all pieces when computing @@ -316,9 +318,6 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { } } - // Mobility - ei.value += apply_weight(ei.mobility, Weights[Mobility]); - // If we don't already have an unusual scale factor, check for opposite // colored bishop endgames, and use a lower scale for those if ( phase < PHASE_MIDGAME @@ -465,12 +464,13 @@ namespace { // evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given color template - void evaluate_pieces(const Position& pos, EvalInfo& ei, Bitboard no_mob_area) { + Score evaluate_pieces(const Position& pos, EvalInfo& ei, Bitboard no_mob_area) { Bitboard b; Square s, ksq; int mob; File f; + Score mobility = SCORE_ZERO; const Color Them = (Us == WHITE ? BLACK : WHITE); const Square* ptr = pos.piece_list_begin(Us, Piece); @@ -504,7 +504,7 @@ namespace { mob = (Piece != QUEEN ? count_1s_max_15(b & no_mob_area) : count_1s(b & no_mob_area)); - ei.mobility += Sign[Us] * MobilityBonus[Piece][mob]; + mobility += MobilityBonus[Piece][mob]; // Decrease score if we are attacked by an enemy pawn. Remaining part // of threat evaluation must be done later when we have full attack info. @@ -563,6 +563,7 @@ namespace { } } } + return mobility; } @@ -603,22 +604,25 @@ namespace { // pieces of a given color. template - void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei) { + Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); + Score mobility = SCORE_ZERO; + // Do not include in mobility squares protected by enemy pawns or occupied by our pieces const Bitboard no_mob_area = ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us)); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); // Sum up all attacked squares ei.attackedBy[Us][0] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING]; + return mobility; } diff --git a/src/evaluate.h b/src/evaluate.h index 75e1f915..18362eaa 100644 --- a/src/evaluate.h +++ b/src/evaluate.h @@ -89,9 +89,6 @@ struct EvalInfo { // 2 to kingAdjacentZoneAttacksCount[BLACK]. int kingAdjacentZoneAttacksCount[2]; - // Middle game and endgame mobility scores - Score mobility; - // Value of the danger for the king of the given color Value kingDanger[2]; }; -- 2.39.5