X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.h;h=8ca13cd005e09bd8178a7d66d66362ee7ca5aee9;hb=41641e3b1eea0038ab6984;hp=751edec90889de2f295751855268db15105702ac;hpb=c5ec94d0f1b128fc2c691c7231663a345409d5cc;p=stockfish
diff --git a/src/material.h b/src/material.h
index 751edec9..8ca13cd0 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"
@@ -39,7 +39,7 @@ 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); }
@@ -50,7 +50,7 @@ struct Entry {
uint8_t factor[COLOR_NB];
EndgameBase* evaluationFunction;
EndgameBase* scalingFunction[COLOR_NB];
- int spaceWeight;
+ Score spaceWeight;
Phase gamePhase;
};
@@ -62,7 +62,7 @@ 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
+/// 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.
@@ -74,4 +74,4 @@ inline ScaleFactor Entry::scale_factor(const Position& pos, Color c) const {
}
-#endif // !defined(MATERIAL_H_INCLUDED)
+#endif // #ifndef MATERIAL_H_INCLUDED