HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-22 01:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong sign for 200 TB score

Browse Source 
Fix another case of 9032c6cbe7

*    TB values can have a distance of 0, mainly when we are in a tb position but haven't found mate.
*    Add a missing whitespace to UCIEngine::on_update_no_moves()

Closes https://github.com/official-stockfish/Stockfish/pull/5172

No functional change
This commit is contained in:
Disservin
2024-04-13 21:54:10 +02:00
committed by Joost VandeVondele
parent 4912f5b0b5
commit c55ae376f6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/score.cpp
View File

@@ -36,7 +36,7 @@ Score::Score(Value v, const Position& pos) {
else if (std::abs(v) <= VALUE_TB) else if (std::abs(v) <= VALUE_TB)
{ {
auto distance = VALUE_TB - std::abs(v); auto distance = VALUE_TB - std::abs(v);
score = (v > 0) ? TBWin{distance} : TBWin{-distance}; score = (v > 0) ? Tablebase{distance, true} : Tablebase{-distance, false};
} }
else else
{ {

7
src/score.h
View File

@@ -34,8 +34,9 @@ class Score {
int plies; int plies;
}; };
struct TBWin { struct Tablebase {
int plies; int plies;
bool win;
}; };
struct InternalUnits { struct InternalUnits {
@@ -61,7 +62,7 @@ class Score {
} }
private: private:
std::variant<Mate, TBWin, InternalUnits> score; std::variant<Mate, Tablebase, InternalUnits> score;
}; };
} }

6
src/uci.cpp
View File

@@ -357,9 +357,9 @@ std::string UCIEngine::format_score(const Score& s) {
auto m = (mate.plies > 0 ? (mate.plies + 1) : mate.plies) / 2; auto m = (mate.plies > 0 ? (mate.plies + 1) : mate.plies) / 2;
return std::string("mate ") + std::to_string(m); return std::string("mate ") + std::to_string(m);
}, },
[](Score::TBWin tb) -> std::string { [](Score::Tablebase tb) -> std::string {
return std::string("cp ") return std::string("cp ")
+ std::to_string((tb.plies > 0 ? TB_CP - tb.plies : -TB_CP - tb.plies)); + std::to_string((tb.win ? TB_CP - tb.plies : -TB_CP - tb.plies));
}, },
[](Score::InternalUnits units) -> std::string { [](Score::InternalUnits units) -> std::string {
return std::string("cp ") + std::to_string(units.value); return std::string("cp ") + std::to_string(units.value);
@@ -435,7 +435,7 @@ Move UCIEngine::to_move(const Position& pos, std::string str) {
} }
void UCIEngine::on_update_no_moves(const Engine::InfoShort& info) { void UCIEngine::on_update_no_moves(const Engine::InfoShort& info) {
sync_cout << "info depth" << info.depth << " score " << format_score(info.score) << sync_endl; sync_cout << "info depth " << info.depth << " score " << format_score(info.score) << sync_endl;
} }
void UCIEngine::on_update_full(const Engine::InfoFull& info, bool showWDL) { void UCIEngine::on_update_full(const Engine::InfoFull& info, bool showWDL) {