From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Mon, 1 Nov 2010 12:27:17 +0000 (+0100)
Subject: Keep count of all on-board piece types
X-Git-Tag: 4.8P~9
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=bdf3b4a8c86501392e95313ef99b46a2f6c217e5;p=fairymax.git

Keep count of all on-board piece types

The array pl[] is used to keep track of the number of pieces of each
type. It is updated when the piece is captured. For now, it ignores
promotions.
---

diff --git a/fairymax.c b/fairymax.c
index 35d785b..2bf32d1 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -188,6 +188,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
        {v=centr[p]?b[x+257]-b[y+257]:0;        /* center positional pts.   */
         if(!(G&S))b[FF]=b[G],v+=50;            /* castling: put R & score  */
         b[G]=b[H]=b[x]=0;b[y]=u|32;            /* do move, set non-virgin  */
+        pl[t&31]-=!!t;                         /* updat victim piece count */
         v-=w[p]>0|R<EG?0:20;                   /*** freeze K in mid-game ***/
         if(p<3)                                /* pawns:                   */
         {v-=9*((x-2&M||b[x-2]-u)+              /* structure, undefended    */
@@ -227,7 +228,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          v=m;                                  /* (prevent fail-lows on    */
         }                                      /*   K-capt. replies)       */
         J=f;Z=g;
-        SHAMAX( pl[k]+=!!t; )
+        SHAMAX( pl[k]+=!!t; ) pl[t&31]+=!!t;
         b[G]=b[FF];b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */
        }                                       /*          if non-castling */
        if(z&S&&Post&K==I&d>2&v>V&v<l){int *p=ps;char X,Y;
@@ -367,8 +368,10 @@ InitGame()
  int i,j;
 
  for(i=0;i<16*BH;i++)b[i]=0;
+ for(i=0;i<32;i++)pl[i]=0;
  K=BW;W(K--)
  {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/
+  pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;
   L=8;W(L--)b[16*L+K+257]=(K-BW/2)*(K-BW/2)+(L-3.5)*(L-3.5); /* center-pts table   */
  }                                                   /*(in unused half b[])*/
  Side = WHITE; Q=0; O=S;
@@ -769,6 +772,7 @@ int main(int argc, char **argv)
                                 if(m=='.') break;
                                 if(m=='#') {
                                         for(i=0; i<128; i++) b[i]=0;
+                                        for(i=0; i<32; i++) pl[i]=0;
                                         Q=0; R=0; O=S;
                                         pl[WHITE]=pl[BLACK]=0;
                                         continue;
@@ -804,7 +808,7 @@ int main(int argc, char **argv)
 					case 0: // undefined piece, ignore
                                             break;
                                         }
-                                        pl[BLACK+WHITE-color]++;
+                                        pl[BLACK+WHITE-color]++;pl[p+color]++;
                                         continue;
                                 }
                         }