Merge branch 'master' of https://github.com/official-stockfish/Stockfish

MichaelB7 · MichaelB7 · commit 513eb2454a91 · 2019-06-22T16:32:06.000-04:00
into McCain official-stockfish#2202, official-stockfish#2196, official-stockfish#2126, official-stockfish#2189, official-stockfish#2194, official-stockfish#1072, official-stockfish#2202, official-stockfish#2192, official-stockfish#2201 and switch back to development status.
diff --git a/src/Makefile b/src/Makefile
@@ -24,18 +24,21 @@
 ### ==========================================================================
 
 ### Executable name
-### McCain bench nodes ----> 5757357  > based on commits up to 6/19/2019
-### stockfish bench nodes -> 3961247* > based on commits up to 6/19/2019
-### * bench agrees with PR #2197 not ye committed which is the shuffling extension fix
-### made on 6/19/2019 by Vondele
+### McCain bench nodes ----> 5472976 > based on commits up to 6/22/2019
+### stockfish bench nodes -> 3398333 > based on commits up to 6/22/2019
+
 ####  Always leave the three lines below as is (any subsequent defines will override)
 DATE=$(shell date +"%m%d%y")
 DATE2=$(shell date +"%m%d")
 FEATURE1=
 
 ### Release versions , enter yes and release version below foor releases
-RELEASE = yes
-RELVERSION = X4
+RELEASE = no
+RELVERSION =
+###  playimg at reduced strength on hardware
+ifeq ($(RELEASE),yes)
+CXXFLAGS += -DRelease
+endif
 
 ### TEST versions, enter yes and labels below to build named test exe's
 TEST = no
@@ -45,14 +48,17 @@ ifeq ($(TEST),yes)
 CXXFLAGS += -DTest
 endif
 
-
-
 ### Uncomment the line below for McCain, comment out for Stockfish
 	VERSION=maverick
 
 ### Uncomment for use with Raspberry Pi -  a slower NPS UCI option setting used in Play
 ### by Elo and personalities
 ###	RASPBERRY=Pi
+###  to reduce NPS setting using "setoption" command, to enable more similiar play when
+###  playimg at reduced strength on hardware
+ifeq ($(RASPBERRY),Pi)
+CXXFLAGS += -DPi
+endif
 
 ### Features include : Cerebellum book functionality, play by Elo (UCI limit strength), keyboard shortcuts and a few other items. Comment out to eliminate
 	FEATURE1=add_features
@@ -66,12 +72,6 @@ ifeq ($(FEATURE1),add_features)
 	SUFFIX1 =
 endif
 
-###  to reduce NPS setting using "setoption" command, to enable more similiar play when
-###  playimg at reduced strength on hardware
-ifeq ($(RASPBERRY),Pi)
-CXXFLAGS += -DPi
-endif
-
 ifeq ($(VERSION),maverick)
 	CXXFLAGS += -DMaverick
 	ifeq ($(RELEASE),no)
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -738,10 +738,8 @@ constexpr Score WeakQueen          = S( 10,  2); // Gunther Dementz weak queen m
             // If the pawn is free to advance, then increase the bonus
             if (pos.empty(blockSq))
             {
-                // If there is a rook or queen attacking/defending the pawn from behind,
-                // consider all the squaresToQueen. Otherwise consider only the squares
-                // in the pawn's path attacked or occupied by the enemy.
-                defendedSquares = unsafeSquares = squaresToQueen = forward_file_bb(Us, s);
+                defendedSquares = squaresToQueen = forward_file_bb(Us, s);
+                unsafeSquares = passed_pawn_span(Us, s);
 
                 bb = forward_file_bb(Them, s) & pos.pieces(ROOK, QUEEN);
 
@@ -751,9 +749,13 @@ constexpr Score WeakQueen          = S( 10,  2); // Gunther Dementz weak queen m
                 if (!(pos.pieces(Them) & bb))
                     unsafeSquares &= attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
 
-                // If there aren't any enemy attacks, assign a big bonus. Otherwise
-                // assign a smaller bonus if the block square isn't attacked.
-                int k = !unsafeSquares ? 20 : !(unsafeSquares & blockSq) ? 9 : 0;
+                // If there are no enemy attacks on passed pawn span, assign a big bonus.
+                // Otherwise assign a smaller bonus if the path to queen is not attacked
+                // and even smaller bonus if it is attacked but block square is not.
+                int k = !unsafeSquares                    ? 35 :
+                        !(unsafeSquares & squaresToQueen) ? 20 :
+                        !(unsafeSquares & blockSq)        ?  9 :
+                                                             0 ;
 
                 // Assign a larger bonus if the block square is defended.
                 if (defendedSquares & blockSq)
diff --git a/src/misc.cpp b/src/misc.cpp
@@ -62,8 +62,10 @@ namespace {
 #define Stockfish
 #endif
 
-#if(defined Maverick && defined Add_Features)
+#if(defined Maverick && defined Add_Features && defined Release)
 const string Version = "X4";
+#else
+const string Version = "";
 #endif
 
 #if(defined Stockfish && defined Add_Features)
@@ -173,7 +175,7 @@ const string engine_info(bool to_uci) {
 
 
 /// Debug functions used mainly to collect run-time statistics
-static int64_t hits[2], means[2];
+static std::atomic<int64_t> hits[2], means[2];
 
 void dbg_hit_on(bool b) { ++hits[0]; if (b) ++hits[1]; }
 void dbg_hit_on(bool c, bool b) { if (c) dbg_hit_on(b); }
diff --git a/src/search.cpp b/src/search.cpp
@@ -1211,15 +1211,11 @@ namespace {
           // Multi-cut pruning
           // Our ttMove is assumed to fail high, and now we failed high also on a reduced
           // search without the ttMove. So we assume this expected Cut-node is not singular,
-          // that is multiple moves fail high, and we can prune the whole subtree by returning
-          // the hard beta bound.
-#ifdef Maverick  // Change multi-cut pruning condition #2192 by miguel-l
-		  else if (eval >= beta && singularBeta > beta)
-			  return beta;
-#else
-          else if (cutNode && singularBeta > beta)
-              return beta;
-#endif
+          // that multiple moves fail high, and we can prune the whole subtree by returning
+          // a soft bound.
+          else if (   eval >= beta
+                   && singularBeta >= beta)
+              return singularBeta;
       }
 
       // Check extension (~2 Elo)
@@ -2156,12 +2152,10 @@ void Tablebases::rank_root_moves(Position& pos, Search::RootMoves& rootMoves) {
         if (dtz_available || rootMoves[0].tbScore <= VALUE_DRAW)
             Cardinality = 0;
     }
-	// Partial revert of "Assorted trivial cleanups 5/2019" #2198 by Syzygy
     else
     {
-        // Clean up "if root_probe()" and "root_probe_wdl()" failures
-        // resulting from the user using incomplete or corrupt tablebase files
+        // Clean up if root_probe() and root_probe_wdl() have failed
         for (auto& m : rootMoves)
-             m.tbRank = 0;
-     }
+            m.tbRank = 0;
+    }
 }
diff --git a/src/thread.h b/src/thread.h
@@ -62,7 +62,7 @@ class Thread {
   Material::Table materialTable;
 
 #ifdef Maverick
-	size_t pvIdx, multiPV, pvLast, shuffleExts;  // Improve multiPV mode by joergoster && #2197 by Vondele
+  size_t pvIdx, multiPV, pvLast, shuffleExts;  // Improve multiPV mode by joergoster
   int selDepth, nmpMinPly, zugzwangMates; //  Gunther Demetz zugzwangSolver
   int64_t visits, allScores; //  Moez Jellouli -> Save_probcut #e05dc73
 #else
