Merge pull request official-stockfish#495 from IIvec/master

IIvec · web-flow · commit 8f3ae68cdc20 · 2017-08-31T17:30:17.000+02:00
New master
diff --git a/appveyor.yml b/appveyor.yml
@@ -13,10 +13,11 @@ os: Visual Studio 2015
 platform:
   - x86
   - x64
-  - Any CPU
 
 # build Configuration, i.e. Debug, Release, etc.
-configuration: Debug
+configuration:
+  - Debug
+  - Release
 
 matrix:
   # The build fail immediately once one of the job fails
@@ -50,13 +51,16 @@ before_build:
       $b = git log HEAD | sls "\b[Bb]ench[ :]+[0-9]{7}" | select -first 1
       $bench = $b -match '\D+(\d+)' | % { $matches[1] }
       Write-Host "Reference bench:" $bench
+      $g = "Visual Studio 14 2015"
+      If (${env:PLATFORM} -eq 'x64') { $g = $g + ' Win64' }
+      cmake -G "${g}" .
+      Write-Host "Generated files for: " $g
 
 build_script:
-  - cmake -G "Visual Studio 14 2015 Win64" .
-  - cmake --build .
+  - cmake --build . --config %CONFIGURATION% -- /verbosity:minimal
 
 before_test:
-  - cd src/Debug
+  - cd src/%CONFIGURATION%
   - ps: |
       # Verify bench number
       ./stockfish bench 2> out.txt 1> null
diff --git a/src/position.cpp b/src/position.cpp
@@ -993,10 +993,8 @@ bool Position::see_ge(Move m, Value threshold) const {
 
   assert(is_ok(m));
 
-  // Castling moves are implemented as king capturing the rook so cannot be
-  // handled correctly. Simply assume the SEE value is VALUE_ZERO that is always
-  // correct unless in the rare case the rook ends up under attack.
-  if (type_of(m) == CASTLING)
+  // Only deal with normal moves, assume others pass a simple see
+  if (type_of(m) != NORMAL)
       return VALUE_ZERO >= threshold;
 
   Square from = from_sq(m), to = to_sq(m);
@@ -1005,16 +1003,8 @@ bool Position::see_ge(Move m, Value threshold) const {
   Value balance; // Values of the pieces taken by us minus opponent's ones
   Bitboard occupied, stmAttackers;
 
-  if (type_of(m) == ENPASSANT)
-  {
-      occupied = SquareBB[to - pawn_push(~stm)]; // Remove the captured pawn
-      balance = PieceValue[MG][PAWN];
-  }
-  else
-  {
-      balance = PieceValue[MG][piece_on(to)];
-      occupied = 0;
-  }
+  balance = PieceValue[MG][piece_on(to)];
+  occupied = 0;
 
   if (balance < threshold)
       return false;
diff --git a/src/search.cpp b/src/search.cpp
@@ -924,8 +924,7 @@ namespace {
               }
 
               // Reduced depth of the next LMR search
-              int mch = std::max(1, moveCount - (ss-1)->moveCount / 16);
-              int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, mch), DEPTH_ZERO) / ONE_PLY;
+              int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, moveCount), DEPTH_ZERO) / ONE_PLY;
 
               // Countermoves based pruning
               if (   lmrDepth < 3

Original file line number	Diff line number	Diff line change
`@@ -924,8 +924,7 @@ namespace {`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`// Reduced depth of the next LMR search`
`927`		`- int mch = std::max(1, moveCount - (ss-1)->moveCount / 16);`
`928`		`- int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, mch), DEPTH_ZERO) / ONE_PLY;`
	`927`	`+ int lmrDepth = std::max(newDepth - reduction<PvNode>(improving, depth, moveCount), DEPTH_ZERO) / ONE_PLY;`
`929`	`928`
`930`	`929`	`// Countermoves based pruning`
`931`	`930`	`if ( lmrDepth < 3`