Merge Joona Kiiski NULL search beta correction

[stockfish] / src / evaluate.h

diff --git a/src/evaluate.h b/src/evaluate.h
index 0d59a754f2173323671dc16e5f58edbeb7b19068..1e97fd35ad9b32542d9a1560398b7bd5110433c3 100644 (file)
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -1,17 +1,18 @@
 /*
-  Glaurung, a UCI chess playing engine.
-  Copyright (C) 2004-2008 Tord Romstad
+  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+  Copyright (C) 2008 Marco Costalba
 
-  Glaurung is free software: you can redistribute it and/or modify
+  Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
-  Glaurung is distributed in the hope that it will be useful,
+
+  Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -42,7 +43,7 @@
 /// EvalInfo object which is used by the search is futilityMargin.
 
 struct EvalInfo {
-  
+
   // Middle game and endgame evaluations:
   Value mgValue, egValue;
 
@@ -65,22 +66,23 @@ struct EvalInfo {
   // f7, g7, h7, f6, g6 and h6.
   Bitboard kingZone[2];
 
-  // kingAttackersCount[color] is the number of pieces of the given color which
-  // attack a square adjacent to the enemy king.
+  // kingAttackersCount[color] is the number of pieces of the given color
+  // which attack a square in the kingZone of the enemy king.
   int kingAttackersCount[2];
 
   // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the
-  // given color which attack a square adjacent to the enemy king.  The weights
-  // of the individual piece types are given by the variables QueenAttackWeight,
-  // RookAttackWeight, BishopAttackWeight and KnightAttackWeight in evaluate.cpp
+  // given color which attack a square in the kingZone of the enemy king. The
+  // weights of the individual piece types are given by the variables
+  // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and
+  // KnightAttackWeight in evaluate.cpp
   int kingAttackersWeight[2];
 
-  // kingZoneAttacksCount[color] is the number of attacks to squares directly
-  // adjacent to the king of the given color.  Pieces which attack more
-  // than one square are counted multiple times.  For instance, if black's
+  // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares
+  // directly adjacent to the king of the given color. Pieces which attack
+  // more than one square are counted multiple times. For instance, if black's
   // king is on g8 and there's a white knight on g5, this knight adds
-  // 2 to kingZoneAttacksCount[BLACK].
-  int kingZoneAttacksCount[2];
+  // 2 to kingAdjacentZoneAttacksCount[BLACK].
+  int kingAdjacentZoneAttacksCount[2];
 
   // mateThreat[color] is a move for the given side which gives a direct mate.
   Move mateThreat[2];
@@ -89,7 +91,7 @@ struct EvalInfo {
   Value mgMobility, egMobility;
 
   // Extra futility margin.  This is added to the standard futility margin
-  // in the quiescence search.  
+  // in the quiescence search.
   Value futilityMargin;
 };
 
@@ -103,6 +105,7 @@ extern Value quick_evaluate(const Position &pos);
 extern void init_eval(int threads);
 extern void quit_eval();
 extern void read_weights(Color sideToMove);
+extern Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]);
 
 
 #endif // !defined(EVALUATE_H_INCLUDED)