X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=6f844926ce9859246b76f72145fed0b84cf32dc8;hp=1a5f110547ca6dcf8d1a2abc35a2228cc892e62c;hb=553655eb073cdd59c726dd77fcf368d499029467;hpb=c88eebc98905b47077ef2b35b35ea5705d448d4f

diff --git a/src/material.h b/src/material.h
index 1a5f1105..6f844926 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
@@ -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,29 +60,29 @@ 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) const;
+  MaterialInfoTable() : funcs(new Endgames()) {}
+  ~MaterialInfoTable() { delete funcs; }
+
+  MaterialInfo* material_info(const Position& pos) const;
   static Phase game_phase(const Position& pos);
 
 private:
   template<Color Us>
   static int imbalance(const int pieceCount[][8]);
 
-  EndgameFunctions* funcs;
+  Endgames* funcs;
 };
 
 
@@ -91,10 +98,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 +122,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)