X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaterial.h;h=f05541cc3b24e6fd52c1c9265ce69d09048ecdd6;hb=2469daebb1b2ec2ca1653754c35327c16838938e;hp=96fd3f8fe994124b30d28d08486c1b391f456164;hpb=ee5514b8fdc6583d134985edd2f875e197830030;p=stockfish
diff --git a/src/material.h b/src/material.h
index 96fd3f8f..f05541cc 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-2013 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"
@@ -42,8 +42,19 @@ struct Entry {
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;
@@ -57,21 +68,7 @@ struct Entry {
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