X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=6f844926ce9859246b76f72145fed0b84cf32dc8;hp=535c216c0742053ecaa852923be264f4d9068e19;hb=553655eb073cdd59c726dd77fcf368d499029467;hpb=85a7456bd7e8a1a01cdbfa8f4b6fb563d15a37c6 diff --git a/src/material.h b/src/material.h index 535c216c..6f844926 100644 --- a/src/material.h +++ b/src/material.h @@ -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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,23 +17,22 @@ along with this program. If not, see . */ - #if !defined(MATERIAL_H_INCLUDED) #define MATERIAL_H_INCLUDED -//// -//// Includes -//// - #include "endgame.h" #include "position.h" +#include "tt.h" +#include "types.h" +const int MaterialTableSize = 8192; -//// -//// Types -//// +/// Game phase +enum Phase { + PHASE_ENDGAME = 0, + PHASE_MIDGAME = 128 +}; -const int MaterialTableSize = 1024; /// MaterialInfo is a class which contains various information about a /// material configuration. It contains a material balance evaluation, @@ -61,48 +60,31 @@ private: Key key; int16_t value; uint8_t factor[2]; - EndgameEvaluationFunctionBase* evaluationFunction; - EndgameScalingFunctionBase* scalingFunction[2]; + EndgameBase* evaluationFunction; + EndgameBase* scalingFunction[2]; int spaceWeight; Phase gamePhase; }; -/// 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 -/// position in the table and returns a pointer to a MaterialInfo object. -class EndgameFunctions; - -class MaterialInfoTable { - MaterialInfoTable(const MaterialInfoTable&); - MaterialInfoTable& operator=(const MaterialInfoTable&); +/// The MaterialInfoTable class represents a pawn hash table. The most important +/// method is material_info(), which returns a pointer to a MaterialInfo object. +class MaterialInfoTable : public SimpleHash { public: - MaterialInfoTable(); - ~MaterialInfoTable(); - MaterialInfo* get_material_info(const Position& pos); + MaterialInfoTable() : funcs(new Endgames()) {} + ~MaterialInfoTable() { delete funcs; } + MaterialInfo* material_info(const Position& pos) const; static Phase game_phase(const Position& pos); private: - MaterialInfo* entries; - EndgameFunctions* funcs; -}; - - -//// -//// Inline functions -//// - + template + static int imbalance(const int pieceCount[][8]); -/// MaterialInfo::material_value simply returns the material balance -/// evaluation that is independent from game phase. - -inline Score MaterialInfo::material_value() const { + Endgames* funcs; +}; - return make_score(value, value); -} /// 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 @@ -113,50 +95,31 @@ inline Score MaterialInfo::material_value() const { 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]); + if (!scalingFunction[c]) + return ScaleFactor(factor[c]); + + ScaleFactor sf = (*scalingFunction[c])(pos); + return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf; } +inline Value MaterialInfo::evaluate(const Position& pos) const { + return (*evaluationFunction)(pos); +} -/// MaterialInfo::space_weight() simply returns the weight for the space -/// evaluation for this material configuration. +inline Score MaterialInfo::material_value() const { + return make_score(value, value); +} inline int MaterialInfo::space_weight() const { - return spaceWeight; } -/// MaterialInfo::game_phase() returns the game phase according -/// to this material configuration. - inline Phase MaterialInfo::game_phase() const { - return gamePhase; } - -/// 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 -/// specialized_eval_exists() returns 'true'. - -inline Value MaterialInfo::evaluate(const Position& pos) const { - - return evaluationFunction->apply(pos); -} - #endif // !defined(MATERIAL_H_INCLUDED)