Revert "Retire eval margin and gains"

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index fb50ddfcf03b5d75237b9de4e5847234cd69232c..3953d1c90dabfcdb462484575c36d0a9963c9717 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -36,7 +36,7 @@
 
 struct TTEntry {
 
 
 struct TTEntry {
 

-  void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev) {
+  void save(uint32_t k, Value v, Bound b, Depth d, Move m, int g, Value ev, Value em) {

 
     key32        = (uint32_t)k;
     move16       = (uint16_t)m;
 
     key32        = (uint32_t)k;
     move16       = (uint16_t)m;


@@ -45,6 +45,7 @@ struct TTEntry {
     value16      = (int16_t)v;
     depth16      = (int16_t)d;
     evalValue    = (int16_t)ev;
     value16      = (int16_t)v;
     depth16      = (int16_t)d;
     evalValue    = (int16_t)ev;

+    evalMargin   = (int16_t)em;

   }
   void set_generation(uint8_t g) { generation8 = g; }
 
   }
   void set_generation(uint8_t g) { generation8 = g; }
 


@@ -55,12 +56,13 @@ struct TTEntry {
   Bound bound() const       { return (Bound)bound8; }
   int generation() const    { return (int)generation8; }
   Value eval_value() const  { return (Value)evalValue; }
   Bound bound() const       { return (Bound)bound8; }
   int generation() const    { return (int)generation8; }
   Value eval_value() const  { return (Value)evalValue; }

+  Value eval_margin() const { return (Value)evalMargin; }

 
 private:
   uint32_t key32;
   uint16_t move16;
   uint8_t bound8, generation8;
 
 private:
   uint32_t key32;
   uint16_t move16;
   uint8_t bound8, generation8;

-  int16_t value16, depth16, evalValue;
+  int16_t value16, depth16, evalValue, evalMargin;

 };
 
 
 };
 
 


@@ -83,7 +85,7 @@ public:
   void refresh(const TTEntry* tte) const;
   void set_size(size_t mbSize);
   void clear();
   void refresh(const TTEntry* tte) const;
   void set_size(size_t mbSize);
   void clear();

-  void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV);
+  void store(const Key key, Value v, Bound type, Depth d, Move m, Value statV, Value kingD);

 
 private:
   uint32_t hashMask;
 
 private:
   uint32_t hashMask;