X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=754d05230093ed22db2be7045e46fe0f6811e9fc;hp=023d4497e456f6c5e0494a763f87f8a552260c19;hb=6933f05f4b1b7b1bd2c072029bf5a06cbeac5b0b;hpb=64d29a633066e39b62af5ee0bbf32645994744ec

diff --git a/src/material.h b/src/material.h
index 023d4497..754d0523 100644
--- a/src/material.h
+++ b/src/material.h
@@ -28,7 +28,7 @@
 namespace Material {
 
 /// Material::Entry contains various information about a material configuration.
-/// It contains a material balance evaluation, a function pointer to a special
+/// It contains a material imbalance evaluation, a function pointer to a special
 /// endgame evaluation function (which in most cases is NULL, meaning that the
 /// standard evaluation function will be used), and "scale factors".
 ///
@@ -38,12 +38,23 @@ namespace Material {
 
 struct Entry {
 
-  Score material_value() const { return make_score(value, value); }
+  Score imbalance() const { return make_score(value, value); }
   Score space_weight() const { return spaceWeight; }
   Phase game_phase() const { return gamePhase; }
   bool specialized_eval_exists() const { return evaluationFunction != NULL; }
   Value evaluate(const Position& pos) const { return (*evaluationFunction)(pos); }
-  ScaleFactor scale_factor(const Position& pos, Color c) const;
+
+  // 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 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 for draws with rook pawns and wrong-colored bishops.
+
+  ScaleFactor scale_factor(const Position& pos, Color c) const {
+
+    return !scalingFunction[c] || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE
+          ? ScaleFactor(factor[c]) : (*scalingFunction[c])(pos);
+  }
 
   Key key;
   int16_t value;
@@ -57,21 +68,7 @@ struct Entry {
 typedef HashTable<Entry, 8192> Table;
 
 Entry* probe(const Position& pos, Table& entries, Endgames& endgames);
-Phase game_phase(const Position& pos);
-
-/// Material::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
-/// 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 Entry::scale_factor(const Position& pos, Color c) const {
-
-  return !scalingFunction[c] || (*scalingFunction[c])(pos) == SCALE_FACTOR_NONE
-        ? ScaleFactor(factor[c]) : (*scalingFunction[c])(pos);
-}
 
-}
+} // namespace Material
 
 #endif // #ifndef MATERIAL_H_INCLUDED