X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaterial.h;h=9992c0b71c51ba55dafde449f61c75f6b4b2b929;hb=d9113d127b491db0a427a416217d55d3d298c25e;hp=bba46d3f7ff71250968d553e6e7c47dc87740116;hpb=71e852ea815be8dd718685cb9e15ccdb8b756211;p=stockfish
diff --git a/src/material.h b/src/material.h
index bba46d3f..9992c0b7 100644
--- 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)
- 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
@@ -17,22 +17,14 @@
along with this program. If not, see .
*/
-
#if !defined(MATERIAL_H_INCLUDED)
#define MATERIAL_H_INCLUDED
-////
-//// Includes
-////
-
#include "endgame.h"
#include "position.h"
-#include "scale.h"
+#include "tt.h"
-
-////
-//// Types
-////
+const int MaterialTableSize = 1024;
/// MaterialInfo is a class which contains various information about a
/// material configuration. It contains a material balance evaluation,
@@ -49,8 +41,6 @@ class MaterialInfo {
friend class MaterialInfoTable;
public:
- MaterialInfo() : key(0) { clear(); }
-
Score material_value() const;
ScaleFactor scale_factor(const Position& pos, Color c) const;
int space_weight() const;
@@ -59,8 +49,6 @@ public:
Value evaluate(const Position& pos) const;
private:
- inline void clear();
-
Key key;
int16_t value;
uint8_t factor[2];
@@ -70,33 +58,21 @@ private:
Phase gamePhase;
};
-/// The MaterialInfoTable class represents a pawn hash table. It is basically
-/// just an array of MaterialInfo objects and a few methods for accessing these
-/// objects. The most important method is get_material_info, which looks up a
-/// position in the table and returns a pointer to a MaterialInfo object.
+/// The MaterialInfoTable class represents a pawn hash table. The most important
+/// method is get_material_info, which returns a pointer to a MaterialInfo object.
class EndgameFunctions;
-class MaterialInfoTable {
-
+class MaterialInfoTable : public SimpleHash {
public:
- MaterialInfoTable(unsigned numOfEntries);
+ MaterialInfoTable();
~MaterialInfoTable();
MaterialInfo* get_material_info(const Position& pos);
-
static Phase game_phase(const Position& pos);
-
private:
- unsigned size;
- MaterialInfo* entries;
EndgameFunctions* funcs;
};
-////
-//// Inline functions
-////
-
-
/// MaterialInfo::material_value simply returns the material balance
/// evaluation that is independent from game phase.
@@ -106,19 +82,6 @@ inline Score MaterialInfo::material_value() const {
}
-/// MaterialInfo::clear() resets a MaterialInfo object to an empty state,
-/// with all slots at their default values but the key.
-
-inline void MaterialInfo::clear() {
-
- value = 0;
- factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);
- evaluationFunction = NULL;
- scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;
- spaceWeight = 0;
-}
-
-
/// 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
/// position in addition to the color, because the scale factor need not
@@ -146,6 +109,7 @@ inline int MaterialInfo::space_weight() const {
return spaceWeight;
}
+
/// MaterialInfo::game_phase() returns the game phase according
/// to this material configuration.