Manual merge

diff --git a/src/bitboard.h b/src/bitboard.h
index eceb845e643112d929c24a8a0b6236ab574fd589..1222ddfa3f50be9051cf85a0e1aa0504f6707ac8 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -8,6 +8,7 @@
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 7c59f5e3084f841572b580eaa22d49a486b9f598..397732b522b8ed96e5bce3a1eb1d578acfb2bc49 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -616,7 +616,7 @@ namespace {
   template<Color Us, Color Them, Bitboard TRank8BB, SquareDelta TDELTA_NE,
            SquareDelta TDELTA_NW, SquareDelta TDELTA_N
           >
-  MoveStack* do_generate_pawn_captures(const Position& pos, MoveStack* mlist) {    
+  MoveStack* do_generate_pawn_captures(const Position& pos, MoveStack* mlist) {
 
     Square to;
     Bitboard pawns = pos.pawns(Us);
@@ -689,7 +689,7 @@ namespace {
   template<Color Us, Color Them, Bitboard TRank8BB, Bitboard TRank3BB,
            SquareDelta TDELTA_NE, SquareDelta TDELTA_NW, SquareDelta TDELTA_N
           >
-  MoveStack* do_generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {   
+  MoveStack* do_generate_pawn_noncaptures(const Position& pos, MoveStack* mlist) {
 
     Bitboard pawns = pos.pawns(Us);
     Bitboard enemyPieces = pos.pieces_of_color(Them);

diff --git a/src/movegen.h b/src/movegen.h
index 2f70311db504790c93723efa92b34666c728edf4..034dd389250099b9eb7fe46f730bcd4ff8cf1c08 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -7,12 +7,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -39,4 +39,5 @@ extern int generate_evasions(const Position &pos, MoveStack *mlist);
 extern int generate_legal_moves(const Position &pos, MoveStack *mlist);
 extern bool move_is_legal(const Position &pos, const Move m, Bitboard pinned);
 
+
 #endif // !defined(MOVEGEN_H_INCLUDED)

diff --git a/src/movepick.cpp b/src/movepick.cpp
index b115e8ffb1a9c3b9a6a1c6371ffef62067eea3e3..187a3c513e0275a112c377919a40d62cbdebf586 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -8,6 +8,7 @@
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -233,25 +234,25 @@ void MovePicker::score_noncaptures() {
   // First score by history, when no history is available then use
   // piece/square tables values. This seems to be better then a
   // random choice when we don't have an history for any move.
-  Move m;\r
-  int hs;\r
-\r
-  for (int i = 0; i < numOfMoves; i++)\r
-  {\r
-      m = moves[i].move;\r
-\r
-      if (m == killer1)\r
-          hs = HistoryMax + 2;\r
-      else if (m == killer2)\r
-          hs = HistoryMax + 1;\r
-      else\r
-          hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);\r
-\r
-      // Ensure moves in history are always sorted as first\r
-      if (hs > 0)\r
-          hs += 1000;\r
-\r
-      moves[i].score = hs + pos.mg_pst_delta(m);\r
+  Move m;
+  int hs;
+
+  for (int i = 0; i < numOfMoves; i++)
+  {
+      m = moves[i].move;
+
+      if (m == killer1)
+          hs = HistoryMax + 2;
+      else if (m == killer2)
+          hs = HistoryMax + 1;
+      else
+          hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
+
+      // Ensure moves in history are always sorted as first
+      if (hs > 0)
+          hs += 1000;
+
+      moves[i].score = hs + pos.mg_pst_delta(m);
   }
 }
 

diff --git a/src/movepick.h b/src/movepick.h
index b48bd8b80bd528e8cff46fef072f13965d88524d..66518ac76861fff4d34a41078e89fa690631100d 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -7,7 +7,11 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
+<<<<<<< HEAD:src/movepick.h
 
+=======
+  
+>>>>>>> d3600c39a745179ed6b094b305d0645e83a1ee86:src/movepick.h
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/src/position.h b/src/position.h
index 8765aac049a9e75520fab73719f43ddbb4c80dd5..a47098a8d61d200284bf0ab6dc0632cc73871594 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -7,12 +7,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -25,8 +25,8 @@
 #if defined(_MSC_VER)
 
 // Forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning(disable: 4800) \r
-\r
+#pragma warning(disable: 4800)
+
 #endif
 
 ////
@@ -48,7 +48,7 @@
 ////
 
 /// FEN string for the initial position:
-const std::string StartPosition = 
+const std::string StartPosition =
   "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 
 /// Maximum number of plies per game (220 should be enough, because the
@@ -64,9 +64,9 @@ const int MaxGameLength = 220;
 /// Castle rights, encoded as bit fields:
 
 enum CastleRights {
-  NO_CASTLES = 0, 
+  NO_CASTLES = 0,
   WHITE_OO = 1,
-  BLACK_OO = 2, 
+  BLACK_OO = 2,
   WHITE_OOO = 4,
   BLACK_OOO = 8,
   ALL_CASTLES = 15
@@ -92,7 +92,7 @@ struct UndoInfo {
 
 
 /// The position data structure.  A position consists of the following data:
-///    
+///
 ///    * For each piece type, a bitboard representing the squares occupied
 ///      by pieces of that type.
 ///    * For each color, a bitboard representing the squares occupiecd by
@@ -281,7 +281,7 @@ public:
 
   // Reset the gamePly variable to 0
   void reset_game_ply();
-  
+
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
 
@@ -329,7 +329,7 @@ private:
 
   // Piece counts
   int pieceCount[2][8]; // [color][pieceType]
-  
+
   // Piece lists
   Square pieceList[2][8][16]; // [color][pieceType][index]
   int index[64];
@@ -591,7 +591,7 @@ inline bool Position::file_is_half_open(Color c, File f) const {
 inline bool Position::square_is_weak(Square s, Color c) const {
   return !(pawns(c) & outpost_mask(opposite_color(c), s));
 }
-                                
+
 inline Key Position::get_key() const {
   return key;
 }
@@ -642,7 +642,7 @@ inline Phase Position::game_phase() const {
   static const Value EndgameLimit = 4 * RookValueMidgame - Value(325);
 
   Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);
-  
+
   if (npm >= MidgameLimit)
       return PHASE_MIDGAME;
   else if(npm <= EndgameLimit)
@@ -687,7 +687,7 @@ inline int Position::rule_50_counter() const {
 inline bool Position::opposite_colored_bishops() const {
 
   return   piece_count(WHITE, BISHOP) == 1
-        && piece_count(BLACK, BISHOP) == 1        
+        && piece_count(BLACK, BISHOP) == 1
         && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0));
 }
 
@@ -695,6 +695,6 @@ inline bool Position::has_pawn_on_7th(Color c) const {
 
   return pawns(c) & relative_rank_bb(c, RANK_7);
 }
-                   
+
 
 #endif // !defined(POSITION_H_INCLUDED)