X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=ba6ad1ea301c386ca30f3d445a0b4a52cdc8539d;hp=08752572e96910dcae4c8dd63782e5b8217a4082;hb=6b909b2343190f2989d21c8f69f40e9f09c530c0;hpb=08c464c690e62b874b7d9b34dfabf455820153d6

diff --git a/src/material.h b/src/material.h
index 08752572..ba6ad1ea 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -21,13 +21,13 @@
 #define MATERIAL_H_INCLUDED
 
 #include "endgame.h"
+#include "misc.h"
 #include "position.h"
-#include "tt.h"
 #include "types.h"
 
 const int MaterialTableSize = 8192;
 
-/// MaterialInfo is a class which contains various information about a
+/// 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
@@ -37,9 +37,9 @@ const int MaterialTableSize = 8192;
 /// 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 MaterialInfo {
+class MaterialEntry {
 
-  friend class MaterialInfoTable;
+  friend struct MaterialTable;
 
 public:
   Score material_value() const;
@@ -53,66 +53,61 @@ private:
   Key key;
   int16_t value;
   uint8_t factor[2];
-  EndgameEvaluationFunctionBase* evaluationFunction;
-  EndgameScalingFunctionBase* scalingFunction[2];
+  EndgameBase<Value>* evaluationFunction;
+  EndgameBase<ScaleFactor>* 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;
+/// The MaterialTable class represents a material hash table. The most important
+/// method is probe(), which returns a pointer to a MaterialEntry object.
 
-class MaterialInfoTable : public SimpleHash<MaterialInfo, MaterialTableSize> {
-public:
-  MaterialInfoTable();
-  ~MaterialInfoTable();
-  MaterialInfo* get_material_info(const Position& pos) const;
-  static Phase game_phase(const Position& pos);
+struct MaterialTable {
 
-private:
-  template<Color Us>
-  static int imbalance(const int pieceCount[][8]);
+  MaterialEntry* probe(const Position& pos);
+  static Phase game_phase(const Position& pos);
+  template<Color Us> static int imbalance(const int pieceCount[][8]);
 
-  EndgameFunctions* funcs;
+  HashTable<MaterialEntry, MaterialTableSize> entries;
+  Endgames endgames;
 };
 
 
-/// MaterialInfo::scale_factor takes a position and a color as input, and
+/// 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 MaterialInfo::scale_factor(const Position& pos, Color c) const {
+inline ScaleFactor MaterialEntry::scale_factor(const Position& pos, Color c) const {
 
   if (!scalingFunction[c])
       return ScaleFactor(factor[c]);
 
-  ScaleFactor sf = scalingFunction[c]->apply(pos);
+  ScaleFactor sf = (*scalingFunction[c])(pos);
   return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf;
 }
 
-inline Score MaterialInfo::material_value() const {
+inline Value MaterialEntry::evaluate(const Position& pos) const {
+  return (*evaluationFunction)(pos);
+}
+
+inline Score MaterialEntry::material_value() const {
   return make_score(value, value);
 }
 
-inline int MaterialInfo::space_weight() const {
+inline int MaterialEntry::space_weight() const {
   return spaceWeight;
 }
 
-inline Phase MaterialInfo::game_phase() const {
+inline Phase MaterialEntry::game_phase() const {
   return gamePhase;
 }
 
-inline bool MaterialInfo::specialized_eval_exists() const {
+inline bool MaterialEntry::specialized_eval_exists() const {
   return evaluationFunction != NULL;
 }
 
-inline Value MaterialInfo::evaluate(const Position& pos) const {
-  return evaluationFunction->apply(pos);
-}
-
 #endif // !defined(MATERIAL_H_INCLUDED)