X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.h;h=cbf6e5550e2b6b1ca55fcd0784ef7074920576cf;hp=c88094cf2d89fe8765ff27240170041b79bbe0d3;hb=c6baefb79df08a60912fc606d035abcc1dd70573;hpb=231f62baf7b6d9cee18bf7e85bed0fc9b78eed73 diff --git a/src/material.h b/src/material.h index c88094cf..cbf6e555 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-2013 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; }; @@ -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