X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.h;h=5e6419458e7dc8dcf7c678f3fe8b8aafa97a2f27;hb=0e508f30bb2129f87b41ab3d721fd0400631f6fc;hp=1a5f110547ca6dcf8d1a2abc35a2228cc892e62c;hpb=c88eebc98905b47077ef2b35b35ea5705d448d4f;p=stockfish
diff --git a/src/material.h b/src/material.h
index 1a5f1105..5e641945 100644
--- a/src/material.h
+++ b/src/material.h
@@ -1,7 +1,8 @@
/*
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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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,102 +18,56 @@
along with this program. If not, see .
*/
-#if !defined(MATERIAL_H_INCLUDED)
+#ifndef MATERIAL_H_INCLUDED
#define MATERIAL_H_INCLUDED
#include "endgame.h"
+#include "misc.h"
#include "position.h"
-#include "tt.h"
#include "types.h"
-const int MaterialTableSize = 1024;
+namespace Material {
-/// MaterialInfo is a class which contains various information about a
-/// 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.
+/// Material::Entry contains various information about a material configuration.
+/// It contains a material imbalance 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.
///
-/// The scale factors are used to scale the evaluation score up or down.
-/// For instance, in KRB vs KR endgames, the score is scaled down by a factor
-/// of 4, which will result in scores of absolute value less than one pawn.
+/// The scale factors are used to scale the evaluation score up or down. For
+/// instance, in KRB vs KR endgames, the score is scaled down by a factor of 4,
+/// which will result in scores of absolute value less than one pawn.
+
+struct Entry {
+
+ Score imbalance() const { return make_score(value, value); }
+ Phase game_phase() const { return gamePhase; }
+ bool specialized_eval_exists() const { return evaluationFunction != nullptr; }
+ Value evaluate(const Position& pos) const { return (*evaluationFunction)(pos); }
+
+ // scale_factor takes a position and a color as input and returns a scale factor
+ // for the given color. We have to provide the position in addition to the color
+ // because the scale factor may also be a function which should be applied to
+ // the position. For instance, in KBP vs K endgames, the scaling function looks
+ // for rook pawns and wrong-colored bishops.
+ ScaleFactor scale_factor(const Position& pos, Color c) const {
+ ScaleFactor sf = scalingFunction[c] ? (*scalingFunction[c])(pos)
+ : SCALE_FACTOR_NONE;
+ return sf != SCALE_FACTOR_NONE ? sf : ScaleFactor(factor[c]);
+ }
-class MaterialInfo {
-
- friend class MaterialInfoTable;
-
-public:
- Score material_value() const;
- ScaleFactor scale_factor(const Position& pos, Color c) const;
- int space_weight() const;
- Phase game_phase() const;
- bool specialized_eval_exists() const;
- Value evaluate(const Position& pos) const;
-
-private:
Key key;
+ const EndgameBase* evaluationFunction;
+ const EndgameBase* scalingFunction[COLOR_NB]; // Could be one for each
+ // side (e.g. KPKP, KBPsKs)
int16_t value;
- uint8_t factor[2];
- EndgameEvaluationFunctionBase* evaluationFunction;
- EndgameScalingFunctionBase* scalingFunction[2];
- int spaceWeight;
+ uint8_t factor[COLOR_NB];
Phase gamePhase;
};
+typedef HashTable Table;
-/// The MaterialInfoTable class represents a pawn hash table. The most important
-/// method is get_material_info, which returns a pointer to a MaterialInfo object.
-class EndgameFunctions;
-
-class MaterialInfoTable : public SimpleHash {
-public:
- MaterialInfoTable();
- ~MaterialInfoTable();
- MaterialInfo* get_material_info(const Position& pos) const;
- static Phase game_phase(const Position& pos);
-
-private:
- template
- static int imbalance(const int pieceCount[][8]);
-
- EndgameFunctions* funcs;
-};
-
-
-/// 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
-/// position in addition to the color, because the scale factor need not
-/// 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])
- return ScaleFactor(factor[c]);
-
- ScaleFactor sf = scalingFunction[c]->apply(pos);
- return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf;
-}
-
-inline Score MaterialInfo::material_value() const {
- return make_score(value, value);
-}
-
-inline int MaterialInfo::space_weight() const {
- return spaceWeight;
-}
-
-inline Phase MaterialInfo::game_phase() const {
- return gamePhase;
-}
-
-inline bool MaterialInfo::specialized_eval_exists() const {
- return evaluationFunction != NULL;
-}
+Entry* probe(const Position& pos);
-inline Value MaterialInfo::evaluate(const Position& pos) const {
- return evaluationFunction->apply(pos);
-}
+} // namespace Material
-#endif // !defined(MATERIAL_H_INCLUDED)
+#endif // #ifndef MATERIAL_H_INCLUDED