Merge branch 'master' of https://github.com/official-stockfish/Stockfish into McCain official-stockfish#2205 official-stockfish#2207 official-stockfish#2160 official-stockfish#2163

MichaelB7 · MichaelB7 · commit 8ece8a64c877 · 2019-06-27T12:36:28.000-04:00
diff --git a/src/Makefile b/src/Makefile
@@ -24,8 +24,8 @@
 ### ==========================================================================
 
 ### Executable name
-### McCain bench nodes ----> 5472976 > based on commits up to 6/22/2019
-### stockfish bench nodes -> 3398333 > based on commits up to 6/22/2019
+### McCain bench nodes ----> 5263810 > based on commits up to 6/27/2019
+### stockfish bench nodes -> 3633546 > based on commits up to 6/27/2019
 
 ####  Always leave the three lines below as is (any subsequent defines will override)
 DATE=$(shell date +"%m%d%y")
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -149,6 +149,7 @@ constexpr Score MobilityBonus[][32] = {
 #ifdef Maverick
 // Combo #1867 Jonathan D - others as noted
 // Assorted bonuses and penalties
+constexpr Score AttacksOnSpaceArea = S(  4,  0);
 constexpr Score BishopPawns        = S(  3,  7);
 constexpr Score CorneredBishop     = S( 50, 50);
 constexpr Score FlankAttacks       = S(  8, -2); //Fauzi
@@ -171,6 +172,7 @@ constexpr Score TrappedRook        = S( 96,  4);
 constexpr Score WeakQueen          = S( 10,  2); // Gunther Dementz weak queen mod
 #else
   // Assorted bonuses and penalties
+  constexpr Score AttacksOnSpaceArea = S(  4,  0);
   constexpr Score BishopPawns        = S(  3,  7);
   constexpr Score CorneredBishop     = S( 50, 50);
   constexpr Score FlankAttacks       = S(  8,  0);
@@ -814,6 +816,8 @@ constexpr Score WeakQueen          = S( 10,  2); // Gunther Dementz weak queen m
     int weight = pos.count<ALL_PIECES>(Us) - 1;
     Score score = make_score(bonus * weight * weight / 16, 0);
 
+    score -= AttacksOnSpaceArea * popcount(attackedBy[Them][ALL_PIECES] & behind & safe);
+
     if (T)
         Trace::add(SPACE, Us, score);
 
diff --git a/src/misc.cpp b/src/misc.cpp
@@ -64,7 +64,7 @@ namespace {
 
 #if(defined Maverick && defined Add_Features && defined Release)
 const string Version = "X4";
-#else
+#elseif(defined Maverick && defined Add_Features)
 const string Version = "";
 #endif
 
diff --git a/src/movepick.cpp b/src/movepick.cpp
@@ -209,7 +209,7 @@ Move MovePicker::next_move(bool skipQuiets) {
           score<QUIETS>();
           partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY);
       }
-      
+
       ++stage;
       /* fallthrough */
 
diff --git a/src/pawns.cpp b/src/pawns.cpp
@@ -38,6 +38,7 @@ namespace {
   constexpr Score Doubled  = S(11, 56);
   constexpr Score Isolated = S( 5, 15);
   constexpr Score WeakUnopposed = S( 13, 27);
+  constexpr Score Attacked2Unsupported = S( 0, 20);
 
   // Connected pawn bonus
   constexpr int Connected[RANK_NB] = { 0, 7, 8, 12, 29, 48, 86 };
@@ -81,8 +82,13 @@ namespace {
     Bitboard theirPawns = pos.pieces(Them, PAWN);
 
     e->passedPawns[Us] = e->pawnAttacksSpan[Us] = 0;
-    e->kingSquares[Us]   = SQ_NONE;
-    e->pawnAttacks[Us]   = pawn_attacks_bb<Us>(ourPawns);
+    e->kingSquares[Us] = SQ_NONE;
+    e->pawnAttacks[Us] = pawn_attacks_bb<Us>(ourPawns);
+
+    // Unsupported enemy pawns attacked twice by us
+    score += Attacked2Unsupported * popcount(  theirPawns
+                                             & pawn_double_attacks_bb<Us>(ourPawns)
+                                             & ~pawn_attacks_bb<Them>(theirPawns));
 
     // Loop through all pawns of the current color and score each pawn
     while ((s = *pl++) != SQ_NONE)
diff --git a/src/search.cpp b/src/search.cpp
@@ -434,11 +434,7 @@ ss->pv = pv;
 #endif
 
   beta = VALUE_INFINITE;
-#ifdef Maverick //Improve multiPV mode #2163 by Joerg Oster
   multiPV = Options["MultiPV"];
-#else
-  size_t multiPV = Options["MultiPV"];
-#endif
   Skill skill(Options["Skill Level"]);
 
 #ifdef Maverick //zugzwangMates  by Gunther Dement
@@ -1158,14 +1154,10 @@ namespace {
           sync_cout << "info depth " << depth / ONE_PLY
                     << " currmove " << UCI::move(move, pos.is_chess960())
                     << " currmovenumber " << moveCount + thisThread->pvIdx << sync_endl;
-#ifdef Maverick  //  Improve multiPV mode #2163 by Joerg Oster
       // In MultiPV mode also skip moves which will be searched later as PV moves
-     //  this section updated by mstembera
-     if (   rootNode
-         && std::find(thisThread->rootMoves.begin() + thisThread->pvIdx, thisThread->rootMoves.begin() + thisThread->pvLast, move)
-             == thisThread->rootMoves.begin() + thisThread->pvLast)
+      if (rootNode && std::count(thisThread->rootMoves.begin() + thisThread->pvIdx + 1,
+                                 thisThread->rootMoves.begin() + thisThread->multiPV, move))
           continue;
-#endif
       if (PvNode)
           (ss+1)->pv = nullptr;
 
diff --git a/src/thread.h b/src/thread.h
@@ -60,13 +60,12 @@ class Thread {
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;
+  size_t pvIdx, multiPV, pvLast, shuffleExts;
 
 #ifdef Maverick
-  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
-  size_t pvIdx, pvLast, shuffleExts; 
   int selDepth, nmpMinPly;   
 #endif
 
diff --git a/src/types.h b/src/types.h
@@ -313,7 +313,6 @@ inline T& operator--(T& d) { return d = T(int(d) - 1); }
 
 #define ENABLE_FULL_OPERATORS_ON(T)                                \
 ENABLE_BASE_OPERATORS_ON(T)                                        \
-ENABLE_INCR_OPERATORS_ON(T)                                        \
 constexpr T operator*(int i, T d) { return T(i * int(d)); }        \
 constexpr T operator*(T d, int i) { return T(int(d) * i); }        \
 constexpr T operator/(T d, int i) { return T(int(d) / i); }        \

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ Move MovePicker::next_move(bool skipQuiets) {`
`209`	`209`	`score<QUIETS>();`
`210`	`210`	`partial_insertion_sort(cur, endMoves, -4000 * depth / ONE_PLY);`
`211`	`211`	`}`
`212`		`-`
	`212`	`+`
`213`	`213`	`++stage;`
`214`	`214`	`/* fallthrough */`
`215`	`215`