kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 17:19:36 +00:00
Code Issues Releases Wiki Activity

Small formatting improvements

Browse source 
Changes some C style casts to C++ style, and fixes some incorrect comments and variable names.

closes #4845

No functional change
This commit is contained in:
cj5716 2023-10-24 07:43:49 +08:00 • committed by Joost VandeVondele
parent 49ece9f791
commit d6a5c2b085
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bitboard.h
View file

@ -298,7 +298,7 @@ inline Square lsb(Bitboard b) {
unsigned long idx; unsigned long idx;
_BitScanForward64(&idx, b); _BitScanForward64(&idx, b);
return (Square) idx; return Square(idx);
#else // MSVC, WIN32 #else // MSVC, WIN32
unsigned long idx; unsigned long idx;
@ -332,7 +332,7 @@ inline Square msb(Bitboard b) {
unsigned long idx; unsigned long idx;
_BitScanReverse64(&idx, b); _BitScanReverse64(&idx, b);
return (Square) idx; return Square(idx);
#else // MSVC, WIN32 #else // MSVC, WIN32

2
src/nnue/evaluate_nnue.cpp
View file

@ -116,7 +116,7 @@ static bool read_header(std::istream& stream, std::uint32_t* hashValue, std::str
static bool write_header(std::ostream& stream, std::uint32_t hashValue, const std::string& desc) { static bool write_header(std::ostream& stream, std::uint32_t hashValue, const std::string& desc) {
write_little_endian<std::uint32_t>(stream, Version); write_little_endian<std::uint32_t>(stream, Version);
write_little_endian<std::uint32_t>(stream, hashValue); write_little_endian<std::uint32_t>(stream, hashValue);
write_little_endian<std::uint32_t>(stream, (std::uint32_t) desc.size()); write_little_endian<std::uint32_t>(stream, std::uint32_t(desc.size()));
stream.write(&desc[0], desc.size()); stream.write(&desc[0], desc.size());
return !stream.fail(); return !stream.fail();
} }

2
src/nnue/layers/sqr_clipped_relu.h
View file

@ -93,7 +93,7 @@ class SqrClippedReLU {
output[i] = static_cast<OutputType>( output[i] = static_cast<OutputType>(
// Really should be /127 but we need to make it fast so we right shift // Really should be /127 but we need to make it fast so we right shift
// by an extra 7 bits instead. Needs to be accounted for in the trainer. // by an extra 7 bits instead. Needs to be accounted for in the trainer.
std::min(127ll, ((long long) input[i] * input[i]) >> (2 * WeightScaleBits + 7))); std::min(127ll, ((long long) (input[i]) * input[i]) >> (2 * WeightScaleBits + 7)));
} }
} }
}; };

4
src/nnue/nnue_common.h
View file

@ -130,11 +130,11 @@ inline void write_little_endian(std::ostream& stream, IntType value) {
{ {
for (; i + 1 < sizeof(IntType); ++i) for (; i + 1 < sizeof(IntType); ++i)
{ {
u[i] = (std::uint8_t) v; u[i] = std::uint8_t(v);
v >>= 8; v >>= 8;
} }
} }
u[i] = (std::uint8_t) v; u[i] = std::uint8_t(v);
stream.write(reinterpret_cast<char*>(u), sizeof(IntType)); stream.write(reinterpret_cast<char*>(u), sizeof(IntType));
} }

20
src/search.cpp
View file

@ -279,9 +279,9 @@ void MainThread::search() {
// consumed, the user stops the search, or the maximum search depth is reached. // consumed, the user stops the search, or the maximum search depth is reached.
void Thread::search() { void Thread::search() {
// Allocate stack with extra size to allow access from (ss-7) to (ss+2): // Allocate stack with extra size to allow access from (ss - 7) to (ss + 2):
// (ss-7) is needed for update_continuation_histories(ss-1) which accesses (ss-6), // (ss - 7) is needed for update_continuation_histories(ss - 1) which accesses (ss - 6),
// (ss+2) is needed for initialization of statScore and killers. // (ss + 2) is needed for initialization of cutOffCnt and killers.
Stack stack[MAX_PLY + 10], *ss = stack + 7; Stack stack[MAX_PLY + 10], *ss = stack + 7;
Move pv[MAX_PLY + 1]; Move pv[MAX_PLY + 1];
Value alpha, beta, delta; Value alpha, beta, delta;
@ -363,13 +363,13 @@ void Thread::search() {
selDepth = 0; selDepth = 0;
// Reset aspiration window starting size // Reset aspiration window starting size
Value prev = rootMoves[pvIdx].averageScore; Value avg = rootMoves[pvIdx].averageScore;
delta = Value(10) + int(prev) * prev / 17470; delta = Value(10) + int(avg) * avg / 17470;
alpha = std::max(prev - delta, -VALUE_INFINITE); alpha = std::max(avg - delta, -VALUE_INFINITE);
beta = std::min(prev + delta, VALUE_INFINITE); beta = std::min(avg + delta, VALUE_INFINITE);
// Adjust optimism based on root move's previousScore (~4 Elo) // Adjust optimism based on root move's averageScore (~4 Elo)
int opt = 113 * prev / (std::abs(prev) + 109); int opt = 113 * avg / (std::abs(avg) + 109);
optimism[us] = Value(opt); optimism[us] = Value(opt);
optimism[~us] = -optimism[us]; optimism[~us] = -optimism[us];
@ -582,7 +582,7 @@ Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth, boo
: value_draw(pos.this_thread()); : value_draw(pos.this_thread());
// Step 3. Mate distance pruning. Even if we mate at the next move our score // Step 3. Mate distance pruning. Even if we mate at the next move our score
// would be at best mate_in(ss->ply+1), but if alpha is already bigger because // would be at best mate_in(ss->ply + 1), but if alpha is already bigger because
// a shorter mate was found upward in the tree then there is no need to search // a shorter mate was found upward in the tree then there is no need to search
// because we will never beat the current alpha. Same logic but with reversed // because we will never beat the current alpha. Same logic but with reversed
// signs apply also in the opposite condition of being mated instead of giving // signs apply also in the opposite condition of being mated instead of giving