Assorted code style and comments in search.cpp

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index c8d841a12f5778bd56f84fb22eab04b86b76dabb..900d51fbb3b6d99a8e001a754312d951f2d04c96 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -1,91 +1,55 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   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/>.
 */
 
-
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
-#include "movegen.h"
-#include "position.h"
-#include "tt.h"
-#include "value.h"
-
-
-////
-//// Constants
-////
-
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
-const int KILLER_MAX = 2;
+#include "move.h"
+#include "types.h"
 
 
-////
-//// Types
-////
-
 /// The SearchStack struct keeps track of the information we need to remember
 /// from nodes shallower and deeper in the tree during the search.  Each
 /// search thread has its own array of SearchStack objects, indexed by the
 /// current ply.
+struct EvalInfo;
+struct SplitPoint;
 
 struct SearchStack {
-  Move pv[PLY_MAX];
   Move currentMove;
-  Value currentMoveCaptureValue;
   Move mateKiller;
-  Move threatMove;
-  Move killers[KILLER_MAX];
+  Move excludedMove;
+  Move bestMove;
+  Move killers[2];
   Depth reduction;
+  Value eval;
+  Value evalMargin;
+  bool skipNullMove;
+  SplitPoint* sp;
 };
 
-
-////
-//// Global variables
-////
-
-extern SearchStack EmptySearchStack;
-extern TranspositionTable TT;
-extern int ActiveThreads;
-extern Lock SMPLock;
-
-// Perhaps better to make H local, and pass as parameter to MovePicker?
-extern History H;  
-
-
-////
-//// Prototypes
-////
+class Position;
 
 extern void init_threads();
-extern void stop_threads();
-extern void think(const Position &pos, bool infinite, bool ponder, int side_to_move,
-                  int time[], int increment[], int movesToGo, int maxDepth, 
-                  int maxNodes, int maxTime, Move searchMoves[]);
-extern int64_t nodes_searched();
-
+extern void exit_threads();
+extern int64_t perft(Position& pos, Depth depth);
+extern bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[],
+                  int movesToGo, int maxDepth, int maxNodes, int maxTime, Move searchMoves[]);
 
 #endif // !defined(SEARCH_H_INCLUDED)