X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.h;h=114e24d5ff330d6906e0c4330d15addaa5c384e2;hb=409930e98c48f9d149c2324c911c52325f368edd;hp=d039dbbf4888eea7ce5ae097fcf10d75ee46e4d3;hpb=0ddf84870ad9f7fb4309e992e1e5eae968577958;p=stockfish
diff --git a/src/material.h b/src/material.h
index d039dbbf..114e24d5 100644
--- a/src/material.h
+++ b/src/material.h
@@ -17,24 +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,
@@ -62,39 +60,30 @@ 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. 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);
+ void init();
+ MaterialInfo* get_material_info(const Position& pos) const;
static Phase game_phase(const Position& pos);
-private:
- EndgameFunctions* funcs;
-};
-
-
-////
-//// Inline functions
-////
-
-/// MaterialInfo::material_value simply returns the material balance
-/// evaluation that is independent from game phase.
+private:
+ template
+ static int imbalance(const int pieceCount[][8]);
-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
@@ -105,50 +94,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]->apply(pos);
+ return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf;
}
+inline Value MaterialInfo::evaluate(const Position& pos) const {
+ return evaluationFunction->apply(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)