Sync material.h with pawns.h

[stockfish] / src / material.h

diff --git a/src/material.h b/src/material.h
index 9992c0b71c51ba55dafde449f61c75f6b4b2b929..84930157d3c03665fe21d2963cbb90c58ec01a24 100644 (file)
--- a/src/material.h
+++ b/src/material.h
@@ -23,6 +23,7 @@
 #include "endgame.h"
 #include "position.h"
 #include "tt.h"
+#include "types.h"
 
 const int MaterialTableSize = 1024;
 
@@ -58,6 +59,7 @@ private:
   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;
@@ -68,20 +70,12 @@ public:
   ~MaterialInfoTable();
   MaterialInfo* get_material_info(const Position& pos);
   static Phase game_phase(const Position& pos);
+
 private:
   EndgameFunctions* funcs;
 };
 
 
-/// MaterialInfo::material_value simply returns the material balance
-/// evaluation that is independent from game phase.
-
-inline Score MaterialInfo::material_value() const {
-
-  return make_score(value, value);
-}
-
-
 /// 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
@@ -91,50 +85,30 @@ inline Score MaterialInfo::material_value() const {
 
 inline ScaleFactor MaterialInfo::scale_factor(const Position& pos, Color c) const {
 
-  if (scalingFunction[c] != NULL)
-  {
-      ScaleFactor sf = scalingFunction[c]->apply(pos);
-      if (sf != SCALE_FACTOR_NONE)
-          return sf;
-  }
-  return ScaleFactor(factor[c]);
-}
+  if (!scalingFunction[c])
+      return ScaleFactor(factor[c]);
 
+  ScaleFactor sf = scalingFunction[c]->apply(pos);
+  return sf == SCALE_FACTOR_NONE ? ScaleFactor(factor[c]) : sf;
+}
 
-/// MaterialInfo::space_weight() simply returns the weight for the space
-/// evaluation for this material configuration.
+inline Score MaterialInfo::material_value() const {
+  return make_score(value, value);
+}
 
 inline int MaterialInfo::space_weight() const {
-
   return spaceWeight;
 }
 
-
-/// MaterialInfo::game_phase() returns the game phase according
-/// to this material configuration.
-
 inline Phase MaterialInfo::game_phase() const {
-
   return gamePhase;
 }
 
-
-/// MaterialInfo::specialized_eval_exists decides whether there is a
-/// specialized evaluation function for the current material configuration,
-/// or if the normal evaluation function should be used.
-
 inline bool MaterialInfo::specialized_eval_exists() const {
-
   return evaluationFunction != NULL;
 }
 
-
-/// MaterialInfo::evaluate applies a specialized evaluation function
-/// to a given position object. It should only be called when
-/// specialized_eval_exists() returns 'true'.
-
 inline Value MaterialInfo::evaluate(const Position& pos) const {
-
   return evaluationFunction->apply(pos);
 }