Move initialization of MaterialInfo in its c'tor

[stockfish] / src / material.h

diff --git a/src/material.h b/src/material.h
index 8b80ba1c5e6992694b5f21431520aafce1255e29..62f4f9a01514031b07bde83c4f27a46cacedead8 100644 (file)
--- a/src/material.h
+++ b/src/material.h
@@ -49,6 +49,8 @@ class MaterialInfo {
   friend class MaterialInfoTable;
 
 public:
   friend class MaterialInfoTable;
 
 public:

+  MaterialInfo() : key(0) { clear(); }
+

   Value mg_value() const;
   Value eg_value() const;
   ScaleFactor scale_factor(const Position& pos, Color c) const;
   Value mg_value() const;
   Value eg_value() const;
   ScaleFactor scale_factor(const Position& pos, Color c) const;


@@ -87,7 +89,6 @@ class MaterialInfoTable {
 public:
   MaterialInfoTable(unsigned numOfEntries);
   ~MaterialInfoTable();
 public:
   MaterialInfoTable(unsigned numOfEntries);
   ~MaterialInfoTable();

-  void clear();

   MaterialInfo* get_material_info(const Position& pos);
 
 private:
   MaterialInfo* get_material_info(const Position& pos);
 
 private:


@@ -116,15 +117,15 @@ inline Value MaterialInfo::eg_value() const {
 
 
 /// MaterialInfo::clear() resets a MaterialInfo object to an empty state,
 
 
 /// MaterialInfo::clear() resets a MaterialInfo object to an empty state,

-/// with all slots at their default values.
+/// with all slots at their default values but the key.

 
 inline void MaterialInfo::clear() {
 
   mgValue = egValue = 0;
   factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);
 
 inline void MaterialInfo::clear() {
 
   mgValue = egValue = 0;
   factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);

-  spaceWeight = 0;

   evaluationFunction = NULL;
   scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;
   evaluationFunction = NULL;
   scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;

+  spaceWeight = 0;

 }
 
 
 }