Replace std::mins/max with clamp function (#2062)

Adding a clamp function makes some of these range limitations a bit prettier and removes some #include's.

STC
LLR: 2.95 (-2.94,2.94) [-3.00,1.00]
Total: 28117 W: 6300 L: 6191 D: 15626
http://tests.stockfishchess.org/tests/view/5c9aa1df0ebc5925cfff8fcc

Non functional change.

diff --git a/src/bitbase.cpp b/src/bitbase.cpp
index 097da917acacd607f29f1d793449a97391453b60..8c8c47020bb2678d74ddc45628bd87f152e6ff88 100644 (file)
--- a/src/bitbase.cpp
+++ b/src/bitbase.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 #include <numeric>
 #include <vector>
 #include <cassert>
 #include <numeric>
 #include <vector>

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index e74304153bf5e8245d637ec37718a2856d50ede2..e4287f356fd19cd766a88df6ed5b8852cf4bfc87 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <bitset>
 #include <bitset>

+#include <algorithm>

 
 #include "bitboard.h"
 #include "misc.h"
 
 #include "bitboard.h"
 #include "misc.h"

diff --git a/src/bitboard.h b/src/bitboard.h
index 6907f184e5429c12866d504e3e69a6ca49979658..aa29abf21adc7a98565fac2346dfbe38a13cde0f 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -249,6 +249,9 @@ template<typename T1, typename T2> inline int distance(T2 x, T2 y);
 template<> inline int distance<File>(Square x, Square y) { return distance(file_of(x), file_of(y)); }
 template<> inline int distance<Rank>(Square x, Square y) { return distance(rank_of(x), rank_of(y)); }
 
 template<> inline int distance<File>(Square x, Square y) { return distance(file_of(x), file_of(y)); }
 template<> inline int distance<Rank>(Square x, Square y) { return distance(rank_of(x), rank_of(y)); }
 

+template<class T> constexpr const T& clamp(const T& v, const T& lo, const T&  hi) {
+  return v < lo ? lo : v > hi ? hi : v;
+}

 
 /// attacks_bb() returns a bitboard representing all the squares attacked by a
 /// piece of type Pt (bishop or rook) placed on 's'.
 
 /// attacks_bb() returns a bitboard representing all the squares attacked by a
 /// piece of type Pt (bishop or rook) placed on 's'.

diff --git a/src/endgame.cpp b/src/endgame.cpp
index 3e572205970d63cba9da91421e81bd291cf5e36c..b1b3d664288ea9fbbae4cf7070c040dff1363294 100644 (file)
--- a/src/endgame.cpp
+++ b/src/endgame.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 
 #include "bitboard.h"
 #include <cassert>
 
 #include "bitboard.h"

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 99c0cd6e1acd512ccc8eaa04cb8609a44f9a4cc0..deb8211ab7d5d86d3f214f0b9e5f11231d786ee6 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 #include <cstring>   // For std::memset
 #include <iomanip>
 #include <cassert>
 #include <cstring>   // For std::memset
 #include <iomanip>

diff --git a/src/material.cpp b/src/material.cpp
index 773f332f20fddfdcebfacf441af9b2f18b19bd82..2e68ee68dd333a5042d524370b2d5e56fb95c5df 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm> // For std::min

 #include <cassert>
 #include <cstring>   // For std::memset
 
 #include <cassert>
 #include <cstring>   // For std::memset
 


@@ -130,7 +129,7 @@ Entry* probe(const Position& pos) {
 
   Value npm_w = pos.non_pawn_material(WHITE);
   Value npm_b = pos.non_pawn_material(BLACK);
 
   Value npm_w = pos.non_pawn_material(WHITE);
   Value npm_b = pos.non_pawn_material(BLACK);

-  Value npm = std::max(EndgameLimit, std::min(npm_w + npm_b, MidgameLimit));
+  Value npm   = clamp(npm_w + npm_b, EndgameLimit, MidgameLimit);

 
   // Map total non-pawn material into [PHASE_ENDGAME, PHASE_MIDGAME]
   e->gamePhase = Phase(((npm - EndgameLimit) * PHASE_MIDGAME) / (MidgameLimit - EndgameLimit));
 
   // Map total non-pawn material into [PHASE_ENDGAME, PHASE_MIDGAME]
   e->gamePhase = Phase(((npm - EndgameLimit) * PHASE_MIDGAME) / (MidgameLimit - EndgameLimit));

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 884747518aab2122b766c3ba42d17902087dc92e..c9c9e5992dbaf83cca00876317e3c3d9456647a1 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 
 #include "bitboard.h"
 #include <cassert>
 
 #include "bitboard.h"


@@ -208,7 +207,7 @@ Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
   Value safety = (shift<Down>(theirPawns) & (FileABB | FileHBB) & BlockRanks & ksq) ?
                  Value(374) : Value(5);
 
   Value safety = (shift<Down>(theirPawns) & (FileABB | FileHBB) & BlockRanks & ksq) ?
                  Value(374) : Value(5);
 

-  File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
+  File center = clamp(file_of(ksq), FILE_B, FILE_G);

   for (File f = File(center - 1); f <= File(center + 1); ++f)
   {
       b = ourPawns & file_bb(f);
   for (File f = File(center - 1); f <= File(center + 1); ++f)
   {
       b = ourPawns & file_bb(f);

diff --git a/src/position.cpp b/src/position.cpp
index 812eabcaa5f625a786792be4d5cf0c09f7214087..2bdf1009b28ce8c006cd5cebd825202310dee943 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 #include <cstddef> // For offsetof()
 #include <cstring> // For std::memset, std::memcmp
 #include <cassert>
 #include <cstddef> // For offsetof()
 #include <cstring> // For std::memset, std::memcmp

diff --git a/src/search.cpp b/src/search.cpp
index 3319ee94798ea234dee492d3ebd338e033df127f..4dd4d78954e1a01859c9dc9ff11dabf69f7f3571 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 #include <cmath>
 #include <cstring>   // For std::memset
 #include <cassert>
 #include <cmath>
 #include <cstring>   // For std::memset


@@ -461,7 +460,7 @@ void Thread::search() {
           && !mainThread->stopOnPonderhit)
       {
           double fallingEval = (306 + 9 * (mainThread->previousScore - bestValue)) / 581.0;
           && !mainThread->stopOnPonderhit)
       {
           double fallingEval = (306 + 9 * (mainThread->previousScore - bestValue)) / 581.0;

-          fallingEval        = std::max(0.5, std::min(1.5, fallingEval));
+          fallingEval = clamp(fallingEval, 0.5, 1.5);

 
           // If the bestMove is stable over several iterations, reduce time accordingly
           timeReduction = lastBestMoveDepth + 10 * ONE_PLY < completedDepth ? 1.95 : 1.0;
 
           // If the bestMove is stable over several iterations, reduce time accordingly
           timeReduction = lastBestMoveDepth + 10 * ONE_PLY < completedDepth ? 1.95 : 1.0;

diff --git a/src/thread.cpp b/src/thread.cpp
index 6c1d729987d90bb237f0b0c9034d78d19aa2d7f0..64dd9e1835d9ee8abf0a3b25f05ef141b55505fc 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm> // For std::count

 #include <cassert>
 
 #include "movegen.h"
 #include <cassert>
 
 #include "movegen.h"

diff --git a/src/timeman.cpp b/src/timeman.cpp
index 484aaa65998684cf6e6718d5c06d8d3b3a4052fd..fafde2aa62033d44a7953d29db8aca23dd78023e 100644 (file)
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cfloat>
 #include <cmath>
 
 #include <cfloat>
 #include <cmath>
 

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 813a0890afe1e4da3a7e9efd49fa3bf79b510079..54f33c9ad9d5656ef7419242937910dc47067dc1 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#include <algorithm>

 #include <cassert>
 #include <ostream>
 #include <sstream>
 #include <cassert>
 #include <ostream>
 #include <sstream>