Move initialization of MaterialInfo in its c'tor

[stockfish] / src / material.h

diff --git a/src/material.h b/src/material.h
index 7ba3b7de00c4760fe16fa51df00d3d1bef7d4fd3..62f4f9a01514031b07bde83c4f27a46cacedead8 100644 (file)
--- a/src/material.h
+++ b/src/material.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)

-  Copyright (C) 2008 Marco Costalba
+  Copyright (C) 2008-2009 Marco Costalba

 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -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;


@@ -65,7 +67,7 @@ private:
   uint8_t factor[2];
   EndgameEvaluationFunctionBase* evaluationFunction;
   EndgameScalingFunctionBase* scalingFunction[2];
   uint8_t factor[2];
   EndgameEvaluationFunctionBase* evaluationFunction;
   EndgameScalingFunctionBase* scalingFunction[2];

-  uint8_t spaceWeight;
+  int spaceWeight;

 };
 
 
 };
 
 


@@ -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,20 +117,20 @@ 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;

 }
 
 
 /// MaterialInfo::scale_factor takes a position and a color as input, and
 }
 
 
 /// MaterialInfo::scale_factor takes a position and a color as input, and

-/// returns a scale factor for the given color.  We have to provide the
+/// returns a scale factor for the given color. We have to provide the

 /// position in addition to the color, because the scale factor need not
 /// to be a constant: It can also be a function which should be applied to
 /// the position. For instance, in KBP vs K endgames, a scaling function
 /// position in addition to the color, because the scale factor need not
 /// to be a constant: It can also be a function which should be applied to
 /// the position. For instance, in KBP vs K endgames, a scaling function


@@ -167,7 +168,7 @@ inline bool MaterialInfo::specialized_eval_exists() const {
 
 
 /// MaterialInfo::evaluate applies a specialized evaluation function
 
 
 /// MaterialInfo::evaluate applies a specialized evaluation function

-/// to a given position object.  It should only be called when
+/// to a given position object. It should only be called when

 /// specialized_eval_exists() returns 'true'.
 
 inline Value MaterialInfo::evaluate(const Position& pos) const {
 /// specialized_eval_exists() returns 'true'.
 
 inline Value MaterialInfo::evaluate(const Position& pos) const {