X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=72d449131439e1ed05cec5bea24056549b1374a0;hp=5fa2e678dfac04a37b54ae354d82b4e54245c4ce;hb=314faa905a60962595d610c26727c4b603c6ed62;hpb=044ad593b3c9fa8ab70f9b2ebfc2c36ce398eb5f diff --git a/src/material.h b/src/material.h index 5fa2e678..72d44913 100644 --- a/src/material.h +++ b/src/material.h @@ -51,7 +51,7 @@ class MaterialInfo { public: MaterialInfo() : key(0) { clear(); } - Value material_value() const; + Score material_value() const; ScaleFactor scale_factor(const Position& pos, Color c) const; int space_weight() const; bool specialized_eval_exists() const; @@ -68,19 +68,11 @@ private: int spaceWeight; }; - -/// 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 /// position in the table and returns a pointer to a MaterialInfo object. +class EndgameFunctions; class MaterialInfoTable { @@ -103,9 +95,9 @@ private: /// MaterialInfo::material_value simply returns the material balance /// evaluation that is independent from game phase. -inline Value MaterialInfo::material_value() const { +inline Score MaterialInfo::material_value() const { - return Value(value); + return make_score(value, value); }