X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaterial.h;h=91163610e708ce7c1bbd4e222f7f6115dee60f57;hb=84dabe5982dab5ee65770eeb77c4f966db9514f8;hp=c88094cf2d89fe8765ff27240170041b79bbe0d3;hpb=231f62baf7b6d9cee18bf7e85bed0fc9b78eed73;p=stockfish
diff --git a/src/material.h b/src/material.h
index c88094cf..91163610 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(MATERIAL_H_INCLUDED)
+#ifndef MATERIAL_H_INCLUDED
#define MATERIAL_H_INCLUDED
#include "endgame.h"
@@ -39,18 +39,29 @@ namespace Material {
struct Entry {
Score material_value() const { return make_score(value, value); }
- int space_weight() const { return spaceWeight; }
+ Score space_weight() const { return spaceWeight; }
Phase game_phase() const { return gamePhase; }
bool specialized_eval_exists() const { return evaluationFunction != NULL; }
- Value evaluate(const Position& p) const { return (*evaluationFunction)(p); }
- ScaleFactor scale_factor(const Position& pos, Color c) const;
+ Value evaluate(const Position& pos) const { return (*evaluationFunction)(pos); }
+
+ // 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;
uint8_t factor[COLOR_NB];
EndgameBase* evaluationFunction;
EndgameBase* scalingFunction[COLOR_NB];
- int spaceWeight;
+ Score spaceWeight;
Phase gamePhase;
};
@@ -59,19 +70,6 @@ typedef HashTable 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
-/// to 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 // !defined(MATERIAL_H_INCLUDED)
+#endif // #ifndef MATERIAL_H_INCLUDED