X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=9992c0b71c51ba55dafde449f61c75f6b4b2b929;hp=9d2175c1038c6d35142faf8d7704e9d24a2af237;hb=09d217bff73d48c39f136c61383609315b0ae173;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c

diff --git a/src/material.h b/src/material.h
index 9d2175c1..9992c0b7 100644
--- a/src/material.h
+++ b/src/material.h
@@ -17,22 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #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,8 +41,6 @@ class MaterialInfo {
   friend class MaterialInfoTable;
 
 public:
-  MaterialInfo() : key(0) { clear(); }
-
   Score material_value() const;
   ScaleFactor scale_factor(const Position& pos, Color c) const;
   int space_weight() const;
@@ -59,8 +49,6 @@ public:
   Value evaluate(const Position& pos) const;
 
 private:
-  inline void clear();
-
   Key key;
   int16_t value;
   uint8_t factor[2];
@@ -70,33 +58,21 @@ private:
   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<MaterialInfo, MaterialTableSize> {
 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.
 
@@ -106,19 +82,6 @@ inline Score MaterialInfo::material_value() const {
 }
 
 
-/// MaterialInfo::clear() resets a MaterialInfo object to an empty state,
-/// with all slots at their default values but the key.
-
-inline void MaterialInfo::clear() {
-
-  value = 0;
-  factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);
-  evaluationFunction = NULL;
-  scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;
-  spaceWeight = 0;
-}
-
-
 /// 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
@@ -146,6 +109,7 @@ inline int MaterialInfo::space_weight() const {
   return spaceWeight;
 }
 
+
 /// MaterialInfo::game_phase() returns the game phase according
 /// to this material configuration.