Assorted trivial cleanups 3/2019 (#2030)

[stockfish] / src / endgame.cpp

diff --git a/src/endgame.cpp b/src/endgame.cpp
index b1b3d664288ea9fbbae4cf7070c040dff1363294..efc41a98844799be346293c83e103da236b32a48 100644 (file)
--- a/src/endgame.cpp
+++ b/src/endgame.cpp
@@ -76,10 +76,7 @@ namespace {
     if (file_of(pos.square<PAWN>(strongSide)) >= FILE_E)
         sq = Square(sq ^ 7); // Mirror SQ_H1 -> SQ_A1
 
     if (file_of(pos.square<PAWN>(strongSide)) >= FILE_E)
         sq = Square(sq ^ 7); // Mirror SQ_H1 -> SQ_A1
 

-    if (strongSide == BLACK)
-        sq = ~sq;
-
-    return sq;
+    return strongSide == WHITE ? sq : ~sq;

   }
 
 } // namespace
   }
 
 } // namespace


@@ -285,18 +282,18 @@ Value Endgame<KQKR>::operator()(const Position& pos) const {
 }
 
 
 }
 
 

-/// KNN vs KP. Simply push the opposing king to the corner.
+/// KNN vs KP. Simply push the opposing king to the corner

 template<>
 Value Endgame<KNNKP>::operator()(const Position& pos) const {
 
 template<>
 Value Endgame<KNNKP>::operator()(const Position& pos) const {
 

-    assert(verify_material(pos, strongSide, 2 * KnightValueMg, 0));
-    assert(verify_material(pos, weakSide, VALUE_ZERO, 1));
+  assert(verify_material(pos, strongSide, 2 * KnightValueMg, 0));
+  assert(verify_material(pos, weakSide, VALUE_ZERO, 1));

 
 

-    Value result =  2 * KnightValueEg
-                  - PawnValueEg
-                  + PushToEdges[pos.square<KING>(weakSide)];
+  Value result =  2 * KnightValueEg
+                - PawnValueEg
+                + PushToEdges[pos.square<KING>(weakSide)];

 
 

-    return strongSide == pos.side_to_move() ? result : -result;
+  return strongSide == pos.side_to_move() ? result : -result;

 }
 
 
 }