X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=94c2d637e4e88a395b4a8c27152bb1ed8637fd08;hp=84930157d3c03665fe21d2963cbb90c58ec01a24;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=7a84b8ca34ee8597920de8e52cae074c31543540

diff --git a/src/material.h b/src/material.h
index 84930157..94c2d637 100644
--- a/src/material.h
+++ b/src/material.h
@@ -25,7 +25,14 @@
 #include "tt.h"
 #include "types.h"
 
-const int MaterialTableSize = 1024;
+const int MaterialTableSize = 8192;
+
+/// Game phase
+enum Phase {
+  PHASE_ENDGAME = 0,
+  PHASE_MIDGAME = 128
+};
+
 
 /// MaterialInfo is a class which contains various information about a
 /// material configuration. It contains a material balance evaluation,
@@ -53,26 +60,28 @@ 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;
+/// method is material_info(), which returns a pointer to a MaterialInfo object.
 
 class MaterialInfoTable : public SimpleHash<MaterialInfo, MaterialTableSize> {
 public:
-  MaterialInfoTable();
   ~MaterialInfoTable();
-  MaterialInfo* get_material_info(const Position& pos);
+  void init();
+  MaterialInfo* material_info(const Position& pos) const;
   static Phase game_phase(const Position& pos);
 
 private:
-  EndgameFunctions* funcs;
+  template<Color Us>
+  static int imbalance(const int pieceCount[][8]);
+
+  Endgames* funcs;
 };
 
 
@@ -88,10 +97,14 @@ inline ScaleFactor MaterialInfo::scale_factor(const Position& pos, Color c) cons
   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 Value MaterialInfo::evaluate(const Position& pos) const {
+  return (*evaluationFunction)(pos);
+}
+
 inline Score MaterialInfo::material_value() const {
   return make_score(value, value);
 }
@@ -108,8 +121,4 @@ inline bool MaterialInfo::specialized_eval_exists() const {
   return evaluationFunction != NULL;
 }
 
-inline Value MaterialInfo::evaluate(const Position& pos) const {
-  return evaluationFunction->apply(pos);
-}
-
 #endif // !defined(MATERIAL_H_INCLUDED)