WebSVN – Games.Chess Giants – Diff – /engine-crafty/validate.c

  *******************************************************************************
  */
 void ValidatePosition(TREE * RESTRICT tree, int ply, int move, char *caller) {
   uint64_t temp, temp1, temp_occ;
   uint64_t temp_occx;
-  int i, square, error;
+  int i, square, error = 0;
   int side, piece, temp_score;
 /*
  ************************************************************
  *                                                          *
  *  First, test occupied[side] which should match the OR    *
  *  result of all pieces[side].                             *
  *                                                          *
  ************************************************************
  */
-  error = 0;
   for (side = black; side <= white; side++) {
     temp_occ =
         Pawns(side) | Knights(side) | Bishops(side) | Rooks(side) |
         Queens(side)
         | Kings(side);
     if (Occupied(side) ^ temp_occ) {
+      if (!error)
+        Print(2048, "\n");
-      Print(128, "ERROR %s occupied squares is bad!\n",
+      Print(2048, "ERROR %s occupied squares is bad!\n",
           (side) ? "white" : "black");
       Display2BitBoards(temp_occ, Occupied(white));
       error = 1;
+    }
+  }
   temp_occx =
       Pawns(white) | Knights(white) | Bishops(white) | Rooks(white) |
       Queens(white) | Pawns(black) | Knights(black) | Bishops(black) |
       Rooks(black) | Queens(black) | Kings(white) | Kings(black);
   if (temp_occ ^ temp_occx) {
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR two pieces on same square\n");
+    Print(2048, "ERROR two pieces on same square\n");
     error = 1;
+  }
 /*
  ************************************************************
  *                                                          *
   temp_score = 0;
   for (side = black; side <= white; side++)
     for (piece = pawn; piece < king; piece++)
       temp_score += PopCnt(Pieces(side, piece)) * PieceValues(side, piece);
   if (temp_score != Material) {
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR  material evaluation is wrong, good=%d, bad=%d\n",
+    Print(2048, "ERROR  material evaluation is wrong, good=%d, bad=%d\n",
         temp_score, Material);
     error = 1;
+  }
 /*
  ************************************************************
   for (side = black; side <= white; side++) {
     temp_score = 0;
     for (piece = knight; piece < king; piece++)
       temp_score += PopCnt(Pieces(side, piece)) * p_vals[piece];
     if (temp_score != TotalPieces(side, occupied)) {
+      if (!error)
+        Print(2048, "\n");
-      Print(128, "ERROR  %s pieces is wrong, good=%d, bad=%d\n",
+      Print(2048, "ERROR  %s pieces is wrong, good=%d, bad=%d\n",
           (side) ? "white" : "black", temp_score, TotalPieces(side,
               occupied));
       error = 1;
+    }
+  }
   for (side = black; side <= white; side++) {
     temp_score = PopCnt(Pawns(side));
     if (temp_score != TotalPieces(side, pawn)) {
+      if (!error)
+        Print(2048, "\n");
-      Print(128, "ERROR  %s pawns is wrong, good=%d, bad=%d\n",
+      Print(2048, "ERROR  %s pawns is wrong, good=%d, bad=%d\n",
           (side) ? "white" : "black", temp_score, TotalPieces(side, pawn));
       error = 1;
+    }
+  }
   i = PopCnt(OccupiedSquares);
   if (i != TotalAllPieces) {
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR!  TotalAllPieces is wrong, correct=%d  bad=%d\n", i,
+    Print(2048, "ERROR!  TotalAllPieces is wrong, correct=%d  bad=%d\n", i,
         TotalAllPieces);
     error = 1;
+  }
 /*
  ************************************************************
     for (piece = pawn; piece <= king; piece++) {
       temp = Pieces(side, piece);
       while (temp) {
         square = LSB(temp);
         if (PcOnSq(square) != pieces[side][piece]) {
+          if (!error)
+            Print(2048, "\n");
-          Print(128, "ERROR!  board[%d]=%d, should be %d\n", square,
+          Print(2048, "ERROR!  board[%d]=%d, should be %d\n", square,
               PcOnSq(square), pieces[side][piece]);
           error = 1;
+        }
         temp &= temp - 1;
+      }
     if (!PcOnSq(i))
       continue;
     side = (PcOnSq(i) > 0) ? 1 : 0;
     if (SetMask(i) & Pieces(side, Abs(PcOnSq(i))))
       continue;
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR!  bitboards/board[%d] don't agree!\n", i);
+    Print(2048, "ERROR!  bitboards/board[%d] don't agree!\n", i);
     error = 1;
     break;
+  }
 /*
  ************************************************************
  */
   temp = ~(temp_occ | temp_occx);
   while (temp) {
     square = LSB(temp);
     if (PcOnSq(square)) {
+      if (!error)
+        Print(2048, "\n");
-      Print(128, "ERROR!  board[%d]=%d, should be 0\n", square,
+      Print(2048, "ERROR!  board[%d]=%d, should be 0\n", square,
           PcOnSq(square));
       error = 1;
+    }
     temp &= temp - 1;
+  }
       temp ^= castle_random[0][side];
     if (Castle(ply, side) < 0 || !(Castle(ply, side) & 2))
       temp ^= castle_random[1][side];
+  }
   if (temp ^ HashKey) {
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR!  hash_key is bad.\n");
+    Print(2048, "ERROR!  hash_key is bad.\n");
     error = 1;
+  }
   if (temp1 ^ PawnHashKey) {
+    if (!error)
+      Print(2048, "\n");
-    Print(128, "ERROR!  pawn_hash_key is bad.\n");
+    Print(2048, "ERROR!  pawn_hash_key is bad.\n");
     error = 1;
+  }
 /*
  ************************************************************
  *                                                          *
  *  help pinpoint the source of the problem.                *
  *                                                          *
  ************************************************************
  */
   if (error) {
+    Lock(lock_smp);
+    Unlock(lock_smp);
-    Print(4095, "processor id: cpu-%d\n", tree->thread_id);
+    Print(2048, "ply=%d\n", tree->ply);
-    Print(4095, "current move:\n");
+    Print(2048, "phase[%d]=%d  current move:\n", ply, tree->phase[ply]);
     DisplayChessMove("move=", move);
     DisplayChessBoard(stdout, tree->position);
-    Print(4095, "called from %s, ply=%d\n", caller, ply);
+    Print(2048, "called from %s, ply=%d\n", caller, ply);
-    Print(4095, "node=%" PRIu64 "\n", tree->nodes_searched);
+    Print(2048, "node=%" PRIu64 "\n", tree->nodes_searched);
-    Print(4095, "active path:\n");
+    Print(2048, "active path:\n");
-    for (i = 1; i <= ply; i++)
+    for (i = 1; i <= ply; i++) {
+      Print(2048, "ply=%d  ", i);
       DisplayChessMove("move=", tree->curmv[i]);
+    }
     CraftyExit(1);
+  }
+}
 #endif

Subversion Repositories Games.Chess Giants

Games.Chess Giants/engine-crafty/validate.c – Rev 33 → 108