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

diff --git a/src/material.h b/src/material.h
index 08752572..e33fc87b 100644
--- a/src/material.h
+++ b/src/material.h
@@ -27,6 +27,13 @@
 
 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,
 /// a function pointer to a special endgame evaluation function (which in
@@ -53,8 +60,8 @@ 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;
 };
@@ -62,12 +69,11 @@ private:
 
 /// 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<MaterialInfo, MaterialTableSize> {
 public:
-  MaterialInfoTable();
   ~MaterialInfoTable();
+  void init();
   MaterialInfo* get_material_info(const Position& pos) const;
   static Phase game_phase(const Position& pos);
 
@@ -75,7 +81,7 @@ private:
   template<Color Us>
   static int imbalance(const int pieceCount[][8]);
 
-  EndgameFunctions* funcs;
+  Endgames* funcs;
 };
 
 
@@ -91,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);
 }
@@ -111,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)