X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmaterial.h;h=67d555a461935215e729717241ccf94d40c5f59b;hb=4502a1934f2d624288b635b5901ecda8cefa342c;hp=ba6ad1ea301c386ca30f3d445a0b4a52cdc8539d;hpb=6b909b2343190f2989d21c8f69f40e9f09c530c0;p=stockfish
diff --git a/src/material.h b/src/material.h
index ba6ad1ea..67d555a4 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(MATERIAL_H_INCLUDED)
+#ifndef MATERIAL_H_INCLUDED
#define MATERIAL_H_INCLUDED
#include "endgame.h"
@@ -25,89 +25,48 @@
#include "position.h"
#include "types.h"
-const int MaterialTableSize = 8192;
+namespace Material {
-/// MaterialEntry 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 {
+ return !scalingFunction[c]
+ || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE ? ScaleFactor(factor[c])
+ : (*scalingFunction[c])(pos);
+ }
-class MaterialEntry {
-
- friend struct MaterialTable;
-
-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;
int16_t value;
- uint8_t factor[2];
+ uint8_t factor[COLOR_NB];
EndgameBase* evaluationFunction;
- EndgameBase* scalingFunction[2];
- int spaceWeight;
+ EndgameBase* scalingFunction[COLOR_NB]; // Could be one for each
+ // side (e.g. KPKP, KBPsKs)
Phase gamePhase;
};
+typedef HashTable Table;
-/// The MaterialTable class represents a material hash table. The most important
-/// method is probe(), which returns a pointer to a MaterialEntry object.
-
-struct MaterialTable {
-
- MaterialEntry* probe(const Position& pos);
- static Phase game_phase(const Position& pos);
- template static int imbalance(const int pieceCount[][8]);
-
- HashTable entries;
- Endgames endgames;
-};
-
-
-/// MaterialEntry::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 MaterialEntry::scale_factor(const Position& pos, Color c) const {
-
- if (!scalingFunction[c])
- return ScaleFactor(factor[c]);
-
- ScaleFactor sf = (*scalingFunction[c])(pos);
- return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf;
-}
-
-inline Value MaterialEntry::evaluate(const Position& pos) const {
- return (*evaluationFunction)(pos);
-}
-
-inline Score MaterialEntry::material_value() const {
- return make_score(value, value);
-}
-
-inline int MaterialEntry::space_weight() const {
- return spaceWeight;
-}
-
-inline Phase MaterialEntry::game_phase() const {
- return gamePhase;
-}
+Entry* probe(const Position& pos);
-inline bool MaterialEntry::specialized_eval_exists() const {
- return evaluationFunction != NULL;
-}
+} // namespace Material
-#endif // !defined(MATERIAL_H_INCLUDED)
+#endif // #ifndef MATERIAL_H_INCLUDED