X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=7fd6fb867be77be6f6a3fbfd4b958c2827865d6e;hb=8b9b119cd471219b66a0e943381a9621dd04a256;hp=2af2697e14d3a618eced449ce5947bba7e050f29;hpb=f70407bdade278fd65c3b4c1829168a38b56b101;p=hachu.git

diff --git a/hachu.c b/hachu.c
index 2af2697..7fd6fb8 100644
--- a/hachu.c
+++ b/hachu.c
@@ -789,7 +789,8 @@ Init (int var)
 
   // piece-square tables
   for(i=0; i<BH; i++) for(j=0; j<BH; j++) {
-    int s = BW*i + j, d = BH*(BH-2) - (2*i - BH + 1)*(2*i - BH + 1) - (2*j - BH + 1)*(2*j - BH + 1);
+    int s = BW*i + j, d = BH*(BH-2) - abs(2*i - BH + 1)*(BH-1) - (2*j - BH + 1)*(2*j - BH + 1);
+    PST[s] = 0;
     PST[BH+s] = d/4 - (i == 0 || i == BH-1 ? 15 : 0) - (j == 0 || j == BH-1 ? 15 : 0);
     PST[BH*BW+s] = d/6;
     PST[BH*BW+BH+s] = d/12;
@@ -798,6 +799,20 @@ Init (int var)
   p[EDGE].qval = 5; // tenjiku jump-capturer sentinel
 }
 
+int
+PSTest ()
+{
+  int r, f, score, tot=0;
+  for(r=0; r<BH; r++) for(f=0; f<BH; f++) {
+    int s = BW*r+f;
+    int piece = board[s];
+    if(!piece) continue;
+    score = p[piece].value + PST[p[piece].pst + s];
+    if(piece & 1) tot += score; else tot -= score;
+  }
+  return tot;
+}
+
 int flag;
 
 inline int
@@ -1522,7 +1537,7 @@ if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=
   nodes++;
   pv[pvPtr++] = 0; // start empty PV, directly behind PV of parent
 
-  firstMove = curMove = sorted = msp += 20; // leave 20 empty slots in front of move list
+  firstMove = curMove = sorted = msp += 50; // leave 50 empty slots in front of move list
   tb.fireMask = phase = 0; iterDep=1; replyDep = (depth < 1 ? depth : 1) - 1;
   do {
 if(flag && depth>= 0) printf("iter %d:%d\n", depth,iterDep),fflush(stdout);
@@ -1540,7 +1555,7 @@ if(flag && depth>= 0) printf("phase=%d: first/curr/last = %d / %d / %d\n", phase
 #if 0
 	    if(curEval >= beta) {
 	      stm ^= WHITE;
-	      score = -Search(-beta, -iterAlpha, difEval, depth-3, promoSuppress & SQUARE, ABSENT);
+	      score = -Search(-beta, -iterAlpha, -difEval, depth-3, promoSuppress & SQUARE, ABSENT);
 	      stm ^= WHITE;
 	      if(score >= beta) { msp = oldMSP; retDep += 3; return score + (score < curEval); }
 	    }
@@ -1611,7 +1626,7 @@ if(PATH) printf("%d:%2d:%2d msp=%d\n",level,depth,iterDep,msp);
       // MOVE EXTRACTION
     extractMove:
 if(flag & depth >= 0) printf("%2d:%d extract %d/%d\n", depth, iterDep, curMove, msp);
-      if(curMove < sorted) {
+      if(curMove > sorted) {
 	move = moveStack[sorted=j=curMove];
 	for(i=curMove+1; i<msp; i++)
 	  if(moveStack[i] > move) move = moveStack[j=i]; // search move with highest priority
@@ -1650,7 +1665,11 @@ MapFromScratch(attacks); // for as long as incremental update does not work.
 	  if(promoSuppress & PROMOTE) score = -INF; // non-Lion captures Lion after opponent did same
 	  defer |= PROMOTE;                         // if we started, flag  he cannot do it in reply
 	}
-        if(score == -INF) { moveStack[curMove] = 0; goto abortMove; } // zap illegal moves
+        if(score == -INF) {
+          if(level == 1) repeatMove[repCnt++] = move & 0xFFFFFF | (p[tb.piece].value == 10*LVAL ? 3<<24 : 1 << 24);
+          moveStack[curMove] = 0; // zap illegal moves
+          goto abortMove;
+        }
       }
 #if 1
       score = -Search(-beta, -iterAlpha, -difEval - tb.booty, replyDep, promoSuppress & ~PROMOTE, defer);
@@ -1703,7 +1722,9 @@ if(PATH) printf("%d:%2d:%d %3d %6x %-10s %6d %6d\n", level, depth, iterDep, curM
         int i;   // WB thinking output
 	printf("%d %d %d %d", iterDep, bestScore, (GetTickCount() - startTime)/10, nodes);
 	for(i=0; pv[i]; i++) printf(" %s", MoveToText(pv[i], 0));
-	printf("\n"); fflush(stdout);
+        if(iterDep == 1) printf(" { root eval = %4.2f dif = %4.2f; abs = %4.2f}", curEval/100., difEval/100., PSTest()/100.);
+	printf("\n");
+        fflush(stdout);
       }
       if(GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish
     }
@@ -1937,7 +1958,8 @@ printf("# deferral of %d\n", deferred);
       for(i=retFirst; i<retMSP; i++) printf("# %d. %08x %08x %s\n", i-50, moveStack[i], ret, MoveToText(moveStack[i], 0));
       reason = NULL;
       for(i=0; i<repCnt; i++) {if((repeatMove[i] & 0xFFFFFF) == ret) {
-        reason = "Repeats earlier position";
+        if(repeatMove[i] & 1<<24) reason = (repeatMove[i] & 1<<25 ? "Distant capture of protected Lion" : "Counterstrike against Lion");
+        else reason = "Repeats earlier position";
         break;
       }
  printf("# %d. %08x %08x %s\n", i, repeatMove[i], ret, MoveToText(repeatMove[i], 0));