X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=62f4f9a01514031b07bde83c4f27a46cacedead8;hp=59f7f3e26001c2d05832118cddc2e0fef5fe5fb4;hb=6d117e4a23dd1a3a22d5553b4ac15d9d15f0aafe;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86 diff --git a/src/material.h b/src/material.h index 59f7f3e2..62f4f9a0 100644 --- a/src/material.h +++ b/src/material.h @@ -1,18 +1,18 @@ /* 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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -35,7 +35,7 @@ //// /// MaterialInfo is a class which contains various information about a -/// material configuration. It contains a material balance evaluation, +/// material configuration. It contains a material balance evaluation, /// a function pointer to a special endgame evaluation function (which in /// most cases is NULL, meaning that the standard evaluation function will /// be used), and "scale factors" for black and white. @@ -49,29 +49,39 @@ class MaterialInfo { friend class MaterialInfoTable; public: + MaterialInfo() : key(0) { clear(); } + Value mg_value() const; Value eg_value() const; - ScaleFactor scale_factor(const Position &pos, Color c) const; + ScaleFactor scale_factor(const Position& pos, Color c) const; + int space_weight() const; bool specialized_eval_exists() const; - Value evaluate(const Position &pos) const; - - static void init(); + Value evaluate(const Position& pos) const; private: void clear(); - + Key key; int16_t mgValue; int16_t egValue; uint8_t factor[2]; - EndgameEvaluationFunction *evaluationFunction; - ScalingFunction *scalingFunction[2]; + EndgameEvaluationFunctionBase* evaluationFunction; + EndgameScalingFunctionBase* scalingFunction[2]; + int spaceWeight; }; -/// The MaterialInfoTable class represents a pawn hash table. It is basically +/// EndgameFunctions class stores the endgame evaluation functions std::map. +/// Because STL library is not thread safe even for read access, the maps, +/// although with identical content, are replicated for each thread. This +/// is faster then using locks with an unique set of global maps. + +class EndgameFunctions; + + +/// The MaterialInfoTable class represents a pawn hash table. It is basically /// just an array of MaterialInfo objects and a few methods for accessing these -/// objects. The most important method is get_material_info, which looks up a +/// objects. The most important method is get_material_info, which looks up a /// position in the table and returns a pointer to a MaterialInfo object. class MaterialInfoTable { @@ -79,12 +89,12 @@ class MaterialInfoTable { public: MaterialInfoTable(unsigned numOfEntries); ~MaterialInfoTable(); - void clear(); - MaterialInfo *get_material_info(const Position &pos); + MaterialInfo* get_material_info(const Position& pos); private: unsigned size; - MaterialInfo *entries; + MaterialInfo* entries; + EndgameFunctions* funcs; }; @@ -96,57 +106,73 @@ private: /// material balance evaluation for the middle game and the endgame. inline Value MaterialInfo::mg_value() const { + return Value(mgValue); } inline Value MaterialInfo::eg_value() const { + return Value(egValue); } /// MaterialInfo::clear() resets a MaterialInfo object to an empty state, -/// with all slots at their default values. +/// with all slots at their default values but the key. inline void MaterialInfo::clear() { + mgValue = egValue = 0; factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL); evaluationFunction = NULL; scalingFunction[WHITE] = scalingFunction[BLACK] = NULL; + spaceWeight = 0; } /// MaterialInfo::scale_factor takes a position and a color as input, and -/// returns a scale factor for the given color. We have to provide the +/// returns a scale factor for the given color. We have to provide the /// position in addition to the color, because the scale factor need not -/// be a constant: It can also be a function which should be applied to -/// the position. For instance, in KBP vs K endgames, a scaling function +/// to be a constant: It can also be a function which should be applied to +/// the position. For instance, in KBP vs K endgames, a scaling function /// which checks for draws with rook pawns and wrong-colored bishops. -inline ScaleFactor MaterialInfo::scale_factor(const Position &pos, Color c) - const { - if(scalingFunction[c] != NULL) { - ScaleFactor sf = scalingFunction[c]->apply(pos); - if(sf != SCALE_FACTOR_NONE) - return sf; +inline ScaleFactor MaterialInfo::scale_factor(const Position& pos, Color c) const { + + if (scalingFunction[c] != NULL) + { + ScaleFactor sf = scalingFunction[c]->apply(pos); + if (sf != SCALE_FACTOR_NONE) + return sf; } return ScaleFactor(factor[c]); } +/// MaterialInfo::space_weight() simply returns the weight for the space +/// evaluation for this material configuration. + +inline int MaterialInfo::space_weight() const { + + return spaceWeight; +} + + /// MaterialInfo::specialized_eval_exists decides whether there is a /// specialized evaluation function for the current material configuration, /// or if the normal evaluation function should be used. inline bool MaterialInfo::specialized_eval_exists() const { + return evaluationFunction != NULL; } -/// MaterialInfo::evaluate applies a specialized evaluation function to a -/// given position object. It should only be called when -/// this->specialized_eval_exists() returns 'true'. +/// MaterialInfo::evaluate applies a specialized evaluation function +/// to a given position object. It should only be called when +/// specialized_eval_exists() returns 'true'. + +inline Value MaterialInfo::evaluate(const Position& pos) const { -inline Value MaterialInfo::evaluate(const Position &pos) const { return evaluationFunction->apply(pos); }