X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmaterial.h;h=cbf6e5550e2b6b1ca55fcd0784ef7074920576cf;hb=56d2c3844a210e74ac0c90f9bd32c4c25d058a83;hp=89f8f55685d0979b1cf6f07d748e897ee9df6c08;hpb=e304db9d1ecf6a2318708483c90fadecf4fac4ee;p=stockfish
diff --git a/src/material.h b/src/material.h
index 89f8f556..cbf6e555 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-2013 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,53 @@
#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 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".
///
/// 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.
-class MaterialEntry {
+struct Entry {
- friend struct MaterialTable;
-
-public:
- Score material_value() const;
+ Score material_value() const { return make_score(value, value); }
+ Score space_weight() const { return spaceWeight; }
+ Phase game_phase() const { return gamePhase; }
+ bool specialized_eval_exists() const { return evaluationFunction != NULL; }
+ Value evaluate(const Position& p) const { return (*evaluationFunction)(p); }
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[COLOR_NB];
EndgameBase* evaluationFunction;
EndgameBase* scalingFunction[COLOR_NB];
- int spaceWeight;
+ Score spaceWeight;
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[][PIECE_TYPE_NB]);
-
- HashTable entries;
- Endgames endgames;
-};
-
+Entry* probe(const Position& pos, Table& entries, Endgames& endgames);
+Phase game_phase(const Position& pos);
-/// MaterialEntry::scale_factor takes a position and a color as input, and
+/// Material::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 ScaleFactor Entry::scale_factor(const Position& pos, Color c) const {
-inline Phase MaterialEntry::game_phase() const {
- return gamePhase;
+ return !scalingFunction[c] || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE
+ ? ScaleFactor(factor[c]) : (*scalingFunction[c])(pos);
}
-inline bool MaterialEntry::specialized_eval_exists() const {
- return evaluationFunction != NULL;
}
-#endif // !defined(MATERIAL_H_INCLUDED)
+#endif // #ifndef MATERIAL_H_INCLUDED