X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.h;h=9992c0b71c51ba55dafde449f61c75f6b4b2b929;hb=c2511243b40964e5ed5f35447baf5663a72da72a;hp=8f9f375116e77c92fcfb06311e3f5d1c0fe5f0b3;hpb=bfd4421f490e721958a77b8304d8ebcb574a583f;p=stockfish
diff --git a/src/material.h b/src/material.h
index 8f9f3751..9992c0b7 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-2009 Marco Costalba
+ Copyright (C) 2008-2010 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,22 +17,14 @@
along with this program. If not, see .
*/
-
#if !defined(MATERIAL_H_INCLUDED)
#define MATERIAL_H_INCLUDED
-////
-//// Includes
-////
-
#include "endgame.h"
#include "position.h"
-#include "scale.h"
-
+#include "tt.h"
-////
-//// Types
-////
+const int MaterialTableSize = 1024;
/// MaterialInfo is a class which contains various information about a
/// material configuration. It contains a material balance evaluation,
@@ -49,68 +41,44 @@ class MaterialInfo {
friend class MaterialInfoTable;
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;
+ Phase game_phase() const;
bool specialized_eval_exists() const;
Value evaluate(const Position& pos) const;
private:
- inline void clear();
-
Key key;
int16_t value;
uint8_t factor[2];
EndgameEvaluationFunctionBase* evaluationFunction;
EndgameScalingFunctionBase* scalingFunction[2];
int spaceWeight;
+ Phase gamePhase;
};
-/// 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.
+/// 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 {
-
+class MaterialInfoTable : public SimpleHash {
public:
- MaterialInfoTable(unsigned numOfEntries);
+ MaterialInfoTable();
~MaterialInfoTable();
MaterialInfo* get_material_info(const Position& pos);
-
+ static Phase game_phase(const Position& pos);
private:
- unsigned size;
- MaterialInfo* entries;
EndgameFunctions* funcs;
};
-////
-//// Inline functions
-////
-
/// MaterialInfo::material_value simply returns the material balance
/// evaluation that is independent from game phase.
-inline Value MaterialInfo::material_value() const {
-
- return Value(value);
-}
-
-
-/// MaterialInfo::clear() resets a MaterialInfo object to an empty state,
-/// with all slots at their default values but the key.
+inline Score MaterialInfo::material_value() const {
-inline void MaterialInfo::clear() {
-
- value = 0;
- factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);
- evaluationFunction = NULL;
- scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;
- spaceWeight = 0;
+ return make_score(value, value);
}
@@ -142,6 +110,15 @@ inline int MaterialInfo::space_weight() const {
}
+/// 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.