HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 17:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small renaming in Tracing

Browse Source 
No functional change.
This commit is contained in:
Marco Costalba
2014-06-09 05:30:18 +09:00
parent ce1c260ea9
commit b6cd89aeaf
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/evaluate.cpp
View File

@@ -76,7 +76,7 @@ namespace {
namespace Tracing { namespace Tracing {
enum Terms { // First 8 entries are for PieceType enum Terms { // First 8 entries are for PieceType
PST = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERMS_NB MATERIAL = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERMS_NB
}; };
Score terms[COLOR_NB][TERMS_NB]; Score terms[COLOR_NB][TERMS_NB];
@@ -763,7 +763,7 @@ namespace {
// In case of tracing add all single evaluation contributions for both white and black // In case of tracing add all single evaluation contributions for both white and black
if (Trace) if (Trace)
{ {
Tracing::add_term(Tracing::PST, pos.psq_score()); Tracing::add_term(Tracing::MATERIAL, pos.psq_score());
Tracing::add_term(Tracing::IMBALANCE, ei.mi->material_value()); Tracing::add_term(Tracing::IMBALANCE, ei.mi->material_value());
Tracing::add_term(PAWN, ei.pi->pawns_value()); Tracing::add_term(PAWN, ei.pi->pawns_value());
Tracing::add_term(Tracing::MOBILITY, apply_weight(mobility[WHITE], Weights[Mobility]) Tracing::add_term(Tracing::MOBILITY, apply_weight(mobility[WHITE], Weights[Mobility])
@@ -796,13 +796,13 @@ namespace {
Score bScore = terms[BLACK][idx]; Score bScore = terms[BLACK][idx];
switch (idx) { switch (idx) {
case PST: case IMBALANCE: case PAWN: case TOTAL: case MATERIAL: case IMBALANCE: case PAWN: case TOTAL:
ss << std::setw(20) << name << " | --- --- | --- --- | " ss << std::setw(15) << name << " | --- --- | --- --- | "
<< std::setw(5) << to_cp(mg_value(wScore - bScore)) << " " << std::setw(5) << to_cp(mg_value(wScore - bScore)) << " "
<< std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n"; << std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n";
break; break;
default: default:
ss << std::setw(20) << name << " | " << std::noshowpos ss << std::setw(15) << name << " | " << std::noshowpos
<< std::setw(5) << to_cp(mg_value(wScore)) << " " << std::setw(5) << to_cp(mg_value(wScore)) << " "
<< std::setw(5) << to_cp(eg_value(wScore)) << " | " << std::setw(5) << to_cp(eg_value(wScore)) << " | "
<< std::setw(5) << to_cp(mg_value(bScore)) << " " << std::setw(5) << to_cp(mg_value(bScore)) << " "
@@ -821,12 +821,12 @@ namespace {
std::stringstream ss; std::stringstream ss;
ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2) ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2)
<< " Eval term | White | Black | Total \n" << " Eval term | White | Black | Total \n"
<< " | MG EG | MG EG | MG EG \n" << " | MG EG | MG EG | MG EG \n"
<< "---------------------+-------------+-------------+-------------\n"; << "----------------+-------------+-------------+-------------\n";
format_row(ss, "Material, PST", PST); format_row(ss, "Material", MATERIAL);
format_row(ss, "Material imbalance", IMBALANCE); format_row(ss, "Imbalance", IMBALANCE);
format_row(ss, "Pawns", PAWN); format_row(ss, "Pawns", PAWN);
format_row(ss, "Knights", KNIGHT); format_row(ss, "Knights", KNIGHT);
format_row(ss, "Bishops", BISHOP); format_row(ss, "Bishops", BISHOP);
@@ -838,7 +838,7 @@ namespace {
format_row(ss, "Passed pawns", PASSED); format_row(ss, "Passed pawns", PASSED);
format_row(ss, "Space", SPACE); format_row(ss, "Space", SPACE);
ss << "---------------------+-------------+-------------+-------------\n"; ss << "----------------+-------------+-------------+-------------\n";
format_row(ss, "Total", TOTAL); format_row(ss, "Total", TOTAL);
ss << "\nTotal Evaluation: " << to_cp(v) << " (white side)\n"; ss << "\nTotal Evaluation: " << to_cp(v) << " (white side)\n";

2
src/evaluate.h
View File

@@ -26,7 +26,7 @@ class Position;
namespace Eval { namespace Eval {
const int Tempo = 17; // Must be visible to search const Value Tempo = Value(17); // Must be visible to search
extern void init(); extern void init();
extern Value evaluate(const Position& pos); extern Value evaluate(const Position& pos);