Introduce update_gains() and refactor some code

[stockfish] / src / evaluate.h

diff --git a/src/evaluate.h b/src/evaluate.h
index 2531182af244a95fe55cba173cbb5762b6568b63..f33774acea4246adc50e3e7ad3376ab6cb64b7e4 100644 (file)
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -25,6 +25,8 @@
 //// Includes
 ////
 
+#include <iostream>
+
 #include "material.h"
 #include "pawns.h"
 
@@ -45,8 +47,10 @@ class Position;
 
 struct EvalInfo {
 
+  EvalInfo() : futilityMargin(Value(0)) {}
+
   // Middle game and endgame evaluations
-  Value mgValue, egValue;
+  Score value;
 
   // Pointers to material and pawn hash table entries
   MaterialInfo* mi;
@@ -89,7 +93,7 @@ struct EvalInfo {
   Move mateThreat[2];
 
   // Middle game and endgame mobility scores.
-  Value mgMobility, egMobility;
+  Score mobility;
 
   // Extra futility margin. This is added to the standard futility margin
   // in the quiescence search.
@@ -102,7 +106,6 @@ struct EvalInfo {
 ////
 
 extern Value evaluate(const Position& pos, EvalInfo& ei, int threadID);
-extern Value quick_evaluate(const Position& pos);
 extern void init_eval(int threads);
 extern void quit_eval();
 extern void read_weights(Color sideToMove);