[gnugo-devel] atari_atari patch

[Gunnar Farneback]

This patch adds an atari_atari test case and a simple fix to solve it.

- update_aa_goal() in combination.c revised
- new test case

/Gunnar

Index: engine/combination.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/combination.c,v
retrieving revision 1.26
diff -u -r1.26 combination.c
--- engine/combination.c        4 Mar 2002 06:49:08 -0000       1.26
+++ engine/combination.c        11 Mar 2002 16:27:03 -0000
@@ -1241,10 +1241,12 @@
 
     /* FIXME: We shouldn't let dead opponent stones stop the
      * propagation of distance.
+     *
+     * As a partial fix we include pos == apos in a test below.
      */
     for (k = 0; k < 4; k++) {
       int pos2 = pos + delta[k];
-      if (board[pos] == other && board[pos2] == EMPTY) {
+      if ((board[pos] == other || pos == apos) && board[pos2] == EMPTY) {
         ENQUEUE(pos2, dists[pos] + 1);
       }
       else if (board[pos] != other && board[pos2] == other) {
Index: regression/atari_atari.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/atari_atari.tst,v
retrieving revision 1.13
diff -u -r1.13 atari_atari.tst
--- regression/atari_atari.tst  10 Mar 2002 10:42:10 -0000      1.13
+++ regression/atari_atari.tst  11 Mar 2002 16:27:03 -0000
@@ -61,3 +61,7 @@
 loadsgf games/nngs/gnugo-3.1.18-gopriest-200201072104.sgf 104
 14 combination_attack black
 #? [PASS]*
+
+loadsgf games/atari_atari05.sgf 291
+15 combination_attack black
+#? [B13]*
Index: regression/games/atari_atari05.sgf
===================================================================
RCS file: regression/games/atari_atari05.sgf
diff -N regression/games/atari_atari05.sgf
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ regression/games/atari_atari05.sgf  11 Mar 2002 16:27:03 -0000
@@ -0,0 +1,51 @@
+(;GM[1]FF[4]
+SZ[19]HA[5]KM[0.5]
+PW[GnuGo (GNU Go 3.1.25)]WR[13k*]
+PB[Logane]BR[NR]
+PC[NNGS]DT[2002-02-21]AP[gnugoclient:2.0]
+RE[W+117.5]
+AB[dd][pd][jj][dp][pp]
+;W[cn];B[cj];W[fc];B[jc];W[qf];B[qj];W[nq];B[jq];W[df]C[L:9];B[fd]
+;W[gd]C[L:7];B[ge];W[hd]C[L:4];B[he];W[qn]C[L:2];B[id];W[qq]C[L:0]
+;B[qp];W[oo];B[op];W[dh];B[pq];W[qr];B[pr];W[ch];B[de];W[ec];B[ed]
+;W[cb]C[L:1];B[dc];W[eb]C[L:2];B[db];W[gb];B[ea];W[fa]C[L:3];B[da]
+;W[hc]C[L:4];B[ic];W[ib]C[L:5];B[jb];W[ie]C[L:6];B[ia];W[hb];B[ha]
+;W[fp];B[ja];W[ga]C[L:5];B[je];W[if];B[jf];W[nc];B[nd];W[md];B[oc]
+;W[ne]C[L:3];B[od];W[lc]C[L:1];B[nb];W[le]C[L:2];B[mc];W[fh]C[L:3]
+;B[ff];W[ig]C[L:4];B[hf];W[cl]C[L:2];B[kd];W[dj];B[ck];W[bi]C[L:3]
+;B[dk];W[po]C[L:4];B[np];W[ld]C[L:1];B[kc];W[lb]C[L:2];B[mb];W[jg]
+C[L:3];B[la];W[mn]C[L:4];B[mp];W[kk]C[L:2];B[jk];W[ek];B[dl];W[ps]
+C[L:1];B[os];W[qs]C[L:0];B[or];W[rp];B[rq];W[rr];B[ro];W[sq];B[so]
+;W[qo];B[rn];W[rm];B[qm];W[pm];B[ql];W[sm];B[rl];W[sp];B[oe];W[ej]
+;B[el];W[rd]C[L:1];B[qd];W[rc]C[L:2];B[qe];W[re]C[L:3];B[pf];W[nf]
+C[L:4];B[of];W[qg]C[L:3];B[pg];W[bp]C[L:4];B[dn];W[eq]C[L:2];B[ep]
+;W[dq]C[L:3];B[co];W[cq]C[L:4];B[cm];W[hq]C[L:5];B[bm];W[ng];B[mf]
+;W[mg]C[L:4];B[lf];W[kf]C[L:3];B[ke];W[kg]C[L:4];B[kb];W[me];B[qh]
+;W[hh]C[L:5];B[rh];W[pb];B[ob];W[ir];B[iq];W[jr];B[kq];W[hk]C[L:6]
+;B[bo];W[kn];B[gg];W[nj];B[rf];W[oh];B[ph];W[qc];B[pa];W[qa]C[L:7]
+;B[oa];W[sb]C[L:8];B[ra];W[qb];B[sd];W[sf];B[rg];W[se]C[L:7];B[sg]
+;W[gh];B[fg];W[hn]C[L:8];B[hp];W[gq]C[L:6];B[ip];W[fn]C[L:7];B[en]
+;W[lr];B[mq];W[fl]C[L:8];B[fm];W[gm]C[L:9];B[em];W[eo];B[do];W[fo]
+;B[go];W[kr];B[mr];W[ms]C[L:10];B[ns];W[gn];B[ls];W[ce];B[ef];W[dg]
+;B[cd];W[be];B[bd];W[ad];B[ac];W[ae];B[bb];W[pl];B[pk];W[ok];B[pj]
+;W[sl];B[rj];W[sk];B[rk];W[oj];B[oi];W[ni];B[pi];W[bj];B[ci];W[bk]
+;B[bl];W[ak];B[al];W[gk];B[ks];W[og];B[js];W[is];B[ms];W[gp];B[ho]
+;W[lq];B[lp];W[hr];B[ko];W[in];B[jo];W[lo];B[mo];W[ln];B[jn];W[kp]
+;B[jm];W[io];B[jp];W[di];B[km];W[no];B[kl];W[il];B[im];W[jl];B[lk]
+;W[kj];B[lj];W[ki];B[lm];W[ml];B[mm];W[nn];B[nm];W[ll];B[om];W[sn]
+;B[sj];W[ol];B[fr];W[er];B[es];W[ds];B[fs];W[cp];B[hl];W[ik];B[gl]
+;W[hm];B[ap];W[aq];B[ao];W[eg];B[br];W[bq];B[fq];W[cr];B[bs];W[cs]
+;B[nl];W[mk];B[mh];W[lh];B[mi];W[nh];B[li];W[mj];B[hg];W[pc];B[];W[]
+C[final_score: W+115.5
+S19 removed
+C18 removed
+A16 removed
+T16 removed
+M14 removed
+K10 removed
+L8 removed
+C6 removed
+N5 removed
+F3 removed
+B2 removed]
+)