X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.h;h=2b2533907a5ed56cc53bae49b46ba1a58d802e51;hp=2531182af244a95fe55cba173cbb5762b6568b63;hb=c7a932bc744f899f53ce0013cbbbaa86915bb2e8;hpb=d3c4618b3ac0e444ce3b9dd894b87f86a50863c5

diff --git a/src/evaluate.h b/src/evaluate.h
index 2531182a..2b253390 100644
--- a/src/evaluate.h
+++ b/src/evaluate.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-2009 Marco Costalba
+  Copyright (C) 2008-2010 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
@@ -25,6 +25,8 @@
 //// Includes
 ////
 
+#include <iostream>
+
 #include "material.h"
 #include "pawns.h"
 
@@ -45,8 +47,10 @@ class Position;
 
 struct EvalInfo {
 
+  EvalInfo() { margin[WHITE] = margin[BLACK] = VALUE_ZERO; }
+
   // Middle game and endgame evaluations
-  Value mgValue, egValue;
+  Score value;
 
   // Pointers to material and pawn hash table entries
   MaterialInfo* mi;
@@ -85,15 +89,8 @@ struct EvalInfo {
   // 2 to kingAdjacentZoneAttacksCount[BLACK].
   int kingAdjacentZoneAttacksCount[2];
 
-  // mateThreat[color] is a move for the given side which gives a direct mate.
-  Move mateThreat[2];
-
-  // Middle game and endgame mobility scores.
-  Value mgMobility, egMobility;
-
-  // Extra futility margin. This is added to the standard futility margin
-  // in the quiescence search.
-  Value futilityMargin;
+  // Value of the score margin we should consider for the given color
+  Value margin[2];
 };
 
 
@@ -101,8 +98,7 @@ struct EvalInfo {
 //// Prototypes
 ////
 
-extern Value evaluate(const Position& pos, EvalInfo& ei, int threadID);
-extern Value quick_evaluate(const Position& pos);
+extern Value evaluate(const Position& pos, EvalInfo& ei);
 extern void init_eval(int threads);
 extern void quit_eval();
 extern void read_weights(Color sideToMove);