Ticket #164: def_both.diff

engine/combination.c

@@ -2 +2 @@
  * This is GNU Go, a Go program. Contact gnugo@gnu.org, or see       *
  * http://www.gnu.org/software/gnugo/ for more information.          *
  *                                                                   *
- * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 and 2006       *
+ * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 and 2007 *
  * by the Free Software Foundation.                                  *
  *                                                                   *
  * This program is free software; you can redistribute it and/or     *
@@ -144 +144 @@
                 remove_attack_threat_move(ii, a_threatened_groups[l]);
               }
             }
-            else if (!defend_both(a_threatened_groups[k],
-                                  a_threatened_groups[l])) {
+            else if (defend_both(a_threatened_groups[k],
+                                 a_threatened_groups[l]) != WIN) {
               TRACE("Double threat at %1m, either %1m or %1m attacked.\n",
                     ii, a_threatened_groups[k], a_threatened_groups[l]);
               add_either_move(ii, ATTACK_STRING, a_threatened_groups[k],

engine/reading.c

@@ -638 +638 @@
   int a_savepos;
   int b_savepos;
   int acode = 0;
-  int dcode = 0;
+  int dcode_a;
+  int dcode_b;
   
   int color = board[astr];
   ASSERT1(IS_STONE(color) , astr);
@@ -653 +654 @@
     bstr = t;
   }
 
-  attack_and_defend(astr, &acode, NULL, &dcode, &a_savepos);
-  if (acode != 0) {
+  attack_and_defend(astr, &acode, NULL, &dcode_a, &a_savepos);
+  if (acode != LOSE) {
     a_threatened = 1;
-    if (dcode != WIN)
-      return 0; /* (astr) already lost */
+    if (dcode_a == LOSE)
+      return LOSE; /* (astr) already lost */
   }
+  else
+    dcode_a = WIN;
   
-  attack_and_defend(bstr, &acode, NULL, &dcode, &b_savepos);
-  if (acode != 0) {
+  attack_and_defend(bstr, &acode, NULL, &dcode_b, &b_savepos);
+  if (acode != LOSE) {
     b_threatened = 1;
-    if (dcode != WIN)
-      return 0; /* (bstr) already lost */
+    if (dcode_b == LOSE)
+      return LOSE; /* (bstr) already lost */
   }
+  else
+    dcode_b = WIN;
 
   /* Neither string can be attacked or only one of them, in which case
    * we have time to save it.
    */
   if (!a_threatened || !b_threatened)
-    return WIN;
+    return gg_min(dcode_a, dcode_b);
   
   /* If both strings are threatened we assume that one will become lost,
    * unless find_defense() happened to return the same defense point for
@@ -682 +687 @@
    */
 
   if (a_savepos == b_savepos)
-    return WIN; /* Both strings can be attacked but also defended 
-                 * by one move. */
+    return gg_min(dcode_a, dcode_b); /* Both strings can be attacked but
+                                        also defended by one move. */
 
   /* We also try each of the returned defense points and see whether
    * the other string can still be attacked. This still gives a

engine/utils.c

@@ -1384 +1384 @@
         && trymove(move, color, "double_atari", NO_MOVE)) {
       if (countlib(move) > 1
           && (BOARD(m, n+dn) == EMPTY || BOARD(m+dm, n) == EMPTY 
-              || !defend_both(POS(m, n+dn), POS(m+dm, n)))) {
+              || defend_both(POS(m, n+dn), POS(m+dm, n)) != WIN)) {
         popgo();
         if (value) {
           if (worm[POS(m, n+dn)].effective_size

patterns/aa_attackpats.db

@@ -434 +434 @@
 ?*?
 BAC
 
-; lib(A) == 1 && lib(B) + lib(C) <= 6 && !oplay_defend_both(*,B,C)
+; lib(A) == 1 && lib(B) + lib(C) <= 6 && oplay_defend_both(*,B,C)!=WIN
 
 
 Pattern A25

patterns/barriers.db

@@ -215 +215 @@
 Oc
 ba
 
-;!safe_omove(a) || oplay_defend_both(a,b,c)
+;!safe_omove(a) || oplay_defend_both(a,b,c)==WIN
 
 
 Pattern Barrier12
@@ -406 +406 @@
 Oab.
 .dcO
 
-;oplay_attack_either(a,b,c,d,b,d) || oplay_defend_both(a,b,c,d,a,c)
+;oplay_attack_either(a,b,c,d,b,d) || oplay_defend_both(a,b,c,d,a,c)==WIN
 
 
 Pattern Barrier24
@@ -656 +656 @@
 OcXe
 .bad
 
-;oplay_defend_both(a,b,c,d,a,e)
+;oplay_defend_both(a,b,c,d,a,e)==WIN
 
 
 Pattern Barrier42
@@ -669 +669 @@
 cD?
 baO
 
-;oplay_attack_either(a,b,b,D) || oplay_defend_both(a,b,a,c)
+;oplay_attack_either(a,b,b,D) || oplay_defend_both(a,b,a,c)==WIN
 
 
 Pattern Barrier43
@@ -696 +696 @@
 ..,o
 ----
 
-;oplay_attack_either(a,b,c,d,d,b) && !oplay_defend_both(a,c,b,c,E)
+;oplay_attack_either(a,b,c,d,d,b) && oplay_defend_both(a,c,b,c,E)!=WIN
 
 
 Pattern Barrier45
@@ -1198 +1198 @@
 bfE
 aDc
 
-;!oplay_defend_both(a,b,c,D,E)
+;oplay_defend_both(a,b,c,D,E)!=WIN
 >return (!xplay_attack(b,f));
 
 
@@ -1486 +1486 @@
 fAb
 
 ;lib(A)==2 && !oplay_attack(b,b)
->return (!xplay_attack(c,d) && xplay_defend_both(e,d,f));
+>return (!xplay_attack(c,d) && xplay_defend_both(e,d,f)==WIN);
 
 
 Pattern Intrusion21
@@ -1894 +1894 @@
 
 ;safe_omove(a)
 ;&& (o_somewhere(e) || oplay_attack(a,e,e))
-;&& !oplay_defend_both(a,b,c,b,D)
+;&& oplay_defend_both(a,b,c,b,D)!=WIN
 >return (!xplay_attack(a,f) && (o_somewhere(e) || (!xplay_attack(e,f))));
 
 
@@ -1913 +1913 @@
 
 ;safe_omove(a)
 ;&& (o_somewhere(b) || oplay_attack(a,b,b))
-;&& !oplay_defend_both(a,c,d,e,F,G)
+;&& oplay_defend_both(a,c,d,e,F,G)!=WIN
 >return (!xplay_attack(a,h));
 
 
@@ -2263 +2263 @@
 cDO
 
 ;oplay_attack(c,b,D)
->return !safe_xmove(a) && !oplay_defend_both(c,b,a,b,D);
+>return !safe_xmove(a) && oplay_defend_both(c,b,a,b,D)!=WIN;
 
 
 Pattern Intrusion63
@@ -2468 +2468 @@
 ebaO
 ----
 
-;!oplay_defend_both(a,b,c,b,D)
+;oplay_defend_both(a,b,c,b,D)!=WIN
 
 >non_xterritory(b);
 >non_xterritory(c);
@@ -2506 +2506 @@
 bac
 ---
 
-;safe_omove(a) && !oplay_defend_both(a,b,c,?,d,b,E)
+;safe_omove(a) && oplay_defend_both(a,b,c,?,d,b,E)!=WIN
 
 >non_xterritory(d);
 
@@ -2675 +2675 @@
 |Xd
 |bX
 
-;!oplay_defend_both(a,b,?,c,a,d)
+;oplay_defend_both(a,b,?,c,a,d)!=WIN
 
 >non_oterritory(a);
 >non_oterritory(c);
@@ -2692 +2692 @@
 |ba
 |Xc
 
-;!xplay_defend_both(a,b,c)
+;xplay_defend_both(a,b,c)!=WIN
 
 >non_oterritory(a);
 
@@ -2709 +2709 @@
 bacO
 ----
 
-;!oplay_defend_both(a,b,c,?,d,b,E)
+;oplay_defend_both(a,b,c,?,d,b,E)!=WIN
 
 >non_xterritory(a);
 >non_xterritory(b);
@@ -2728 +2728 @@
 dcaeO
 -----
 
-;!oplay_defend_both(a,b,c,d,e,?,f,d,b)
+;oplay_defend_both(a,b,c,d,e,?,f,d,b)!=WIN
 
 >non_xterritory(a);
 >non_xterritory(b);
@@ -3096 +3096 @@
 .cX
 .ab
 
-;!xplay_defend_both(a,b,c)
+;xplay_defend_both(a,b,c)!=WIN
 
 >non_oterritory(a);
 
@@ -3115 +3115 @@
 .DO
 .bC
 
-;!oplay_defend_both(a,?,b,C,D)
+;oplay_defend_both(a,?,b,C,D)!=WIN
 
 >non_xterritory(b);
 
@@ -3172 +3172 @@
 bX
 ac
 
-;!xplay_defend_both(a,b,c) && !adjacent_to_defendable_stone_in_atari(b)
+;xplay_defend_both(a,b,c)!=WIN && !adjacent_to_defendable_stone_in_atari(b)
 ;&& !adjacent_to_defendable_stone_in_atari(c)
 
 >non_oterritory(a);
@@ -3286 +3286 @@
 Oab
 ?Xc
 
-;!oplay_defend_both(a,b,a,c)
+;oplay_defend_both(a,b,a,c)!=WIN
 
 >non_oterritory(b);
 >non_oterritory(d);
@@ -3344 +3344 @@
 bXa
 cdX
 
-;!safe_omove(a) && !oplay_defend_both(b,a,?,c,b,d)
+;!safe_omove(a) && oplay_defend_both(b,a,?,c,b,d)!=WIN
 
 >non_oterritory(c);
 
@@ -3403 +3403 @@
 ...
 ---
 
-;oplay_defend_both(a,b,c,D,b) && oplay_attack(a,b,a)
+;oplay_defend_both(a,b,c,D,b)==WIN && oplay_attack(a,b,a)
 
 >non_oterritory(e);
 

patterns/endgame.db

@@ -547 +547 @@
 X*
 --
 
-;eye(*) && proper_eye(a) && oplay_defend_both(*,a,*,b)
+;eye(*) && proper_eye(a) && oplay_defend_both(*,a,*,b)==WIN
 
 
 Pattern EE303

patterns/helpers.c

@@ -579 +579 @@
       if (TRYMOVE(cpos, other)) {
         if (board[bpos] == EMPTY
             || board[epos] == EMPTY
-            || !defend_both(bpos, epos))
+            || defend_both(bpos, epos) != WIN)
           result = 1;
         popgo();
       }
@@ -639 +639 @@
         if (TRYMOVE(cpos, color)) {
           if (board[bpos] == EMPTY
               || board[epos] == EMPTY
-              || !defend_both(bpos, epos))
+              || defend_both(bpos, epos) != WIN)
             result = 1;
           popgo();
         }
@@ -663 +663 @@
   ASSERT1(board[worma] == OTHER_COLOR(color)
           && board[wormb] == OTHER_COLOR(color), move);
 
-  if (!defend_both(worma, wormb)) {
+  if (defend_both(worma, wormb) != WIN) {
     if (0)
       gprintf("%1m: Reject attack_either_move for %1m, %1m (can't defend both)\n",
               move, worma, wormb);
@@ -677 +677 @@
           gprintf("%1m: Rej. attack_either_move for %1m & %1m (regular attack)\n",
                   move, worma, wormb);
       }
-      else if (!defend_both(worma, wormb))
+      else if (defend_both(worma, wormb) != WIN)
         add_either_move(move, ATTACK_STRING, find_origin(worma),
                         ATTACK_STRING, find_origin(wormb));
       else {

patterns/owl_attackpats.db

@@ -733 +733 @@
 ....
 ----
 
-;!xplay_defend_both(*,b,c,a,b)
+;xplay_defend_both(*,b,c,a,b)!=WIN
 
 
 Pattern A218
@@ -881 +881 @@
 ...x
 ----
 
-;xplay_attack(*,a,C) || !xplay_defend_both(*,a,b,a,C)
+;xplay_attack(*,a,C) || xplay_defend_both(*,a,b,a,C)!=WIN
 
 
 Pattern A227
@@ -1280 +1280 @@
 Y*..
 ?..?
 
-; oplay_defend_both(*,a,*,b) && !oplay_attack(*,a,b)
+; oplay_defend_both(*,a,*,b)==WIN && !oplay_attack(*,a,b)
 
 
 Pattern A401a
@@ -1298 +1298 @@
 Y*..
 ?..?
 
-; oplay_defend_both(*,a,*,b)
+; oplay_defend_both(*,a,*,b)==WIN
 
 
 Pattern A402
@@ -1332 +1332 @@
 Aad
 OYX
 
-; oplay_defend_both(*,a,b,c,A,b) && oplay_defend_both(*,b,a,d,*,A)
+; oplay_defend_both(*,a,b,c,A,b)==WIN && oplay_defend_both(*,b,a,d,*,A)==WIN
 
 
 Pattern A403b
@@ -1351 +1351 @@
 OYX
 
 ; owl_escape_value(e)>0
-; && oplay_defend_both(*,a,b,c,A,b) && oplay_defend_both(*,b,a,d,*,A)
+; && oplay_defend_both(*,a,b,c,A,b)==WIN && oplay_defend_both(*,b,a,d,*,A)==WIN
 
 
 Pattern A404
@@ -1646 +1646 @@
 .*Y
 Abc
 
-;owl_escape_value(A)>0 && oplay_defend_both(*,b,*,c)
+;owl_escape_value(A)>0 && oplay_defend_both(*,b,*,c)==WIN
 
 
 Pattern A416
@@ -1705 +1705 @@
 .*A
 
 ;(owl_escape_value(A)>0)
-; && oplay_defend_both(*,c,*,d)
+; && oplay_defend_both(*,c,*,d)==WIN
 
 
 Pattern A419b
@@ -1720 +1720 @@
 .*Y
 
 ;(owl_escape_value(A)>0)
-; && oplay_defend_both(*,c,*,d)
+; && oplay_defend_both(*,c,*,d)==WIN
 
 
 Pattern A420
@@ -1738 +1738 @@
 bd*.
 xexx
 
-;owl_escape_value(e)>0 && !xplay_defend_both(*,a,b,c,d)
+;owl_escape_value(e)>0 && xplay_defend_both(*,a,b,c,d)!=WIN
 
 
 Pattern A421
@@ -2476 +2476 @@
 XA*
 ---
 
-; oplay_defend_both(*,A,b,*)
+; oplay_defend_both(*,A,b,*)==WIN
 
 
 Pattern A619
@@ -2906 +2906 @@
 
 ;lib(A) == 3 && !obvious_false_xeye(d)
 ;&& oplay_defend(*,b,c,*) && oplay_defend(*,e,c,*)
-;&& oplay_defend_both(*,c,b,d,e,b,e)
+;&& oplay_defend_both(*,c,b,d,e,b,e)==WIN
 
 
 #########################################################
@@ -3696 +3696 @@
 X*?
 
 ; owl_escape_value(b)>0
-; && oplay_defend_both(*,A,b,c,b)
-; && oplay_defend_both(*,A,b,b,*)
+; && oplay_defend_both(*,A,b,c,b)==WIN
+; && oplay_defend_both(*,A,b,b,*)==WIN
 
 
 Pattern A1014
@@ -3727 +3727 @@
 AfgB
 
 ; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
-; && oplay_defend_both(*,g,f,e,f,*)
+; && oplay_defend_both(*,g,f,e,f,*)==WIN
 
 
 Pattern A1015a
@@ -3741 +3741 @@
 AfgB
 
 ; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
-; && oplay_defend_both(*,g,f,e,f,*)
+; && oplay_defend_both(*,g,f,e,f,*)==WIN
 
 
 Pattern A1016
@@ -3760 +3760 @@
 
 ; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
 ; && ((x_somewhere(d) && xplay_attack_either(*,c,c,e))
-;     || (!x_somewhere(d) && !xplay_defend_both(*,c,d,c,e)))
+;     || (!x_somewhere(d) && xplay_defend_both(*,c,d,c,e)!=WIN))
 
 
 Pattern A1016a
@@ -3779 +3779 @@
 
 ; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
 ; && ((x_somewhere(d) && xplay_attack_either(*,c,c,e))
-;     || (!x_somewhere(d) && !xplay_defend_both(*,c,d,c,e)))
+;     || (!x_somewhere(d) && xplay_defend_both(*,c,d,c,e)!=WIN))
 
 
 Pattern A1017
@@ -4012 +4012 @@
 ?Y?
 
 ; vital_chain(A) && vital_chain(B)
-; && !xplay_defend_both(*,A,B)
+; && xplay_defend_both(*,A,B)!=WIN
 
 
 Pattern A1102
@@ -4027 +4027 @@
 c*O
 ?Y?
 
-;!xplay_defend_both(*,a,b,a,c)
+;xplay_defend_both(*,a,b,a,c)!=WIN
 
 
 Pattern A1104
@@ -4102 +4102 @@
 Yb?
 
 ; vital_chain(a) && vital_chain(b)
-; && !xplay_defend_both(*,a,b)
+; && xplay_defend_both(*,a,b)!=WIN
 
 
 Pattern A1107b
@@ -4122 +4122 @@
 Yc
 
 ;lib(c)>2 && vital_chain(b) && vital_chain(c)
-;&& oplay_attack(*,a,a) && !xplay_defend_both(a,b,c)
+;&& oplay_attack(*,a,a) && xplay_defend_both(a,b,c)!=WIN
 
 # nn Removal candidate (3.3.13)
 #   Success rate in regressions : 0.9 % (23/2562)
@@ -4142 +4142 @@
 Yc
 
 ;lib(c)>2 && vital_chain(b) && vital_chain(c)
-;&& oplay_attack(*,a,a) && !xplay_defend_both(a,b,c)
+;&& oplay_attack(*,a,a) && xplay_defend_both(a,b,c)!=WIN
 
 
 Pattern A1108
@@ -4282 +4282 @@
 *bX
 xCx
 
-;owl_escape_value(C)>0 && owl_goal_dragon(D) && !xplay_defend_both(*,a,b)
+;owl_escape_value(C)>0 && owl_goal_dragon(D) && xplay_defend_both(*,a,b)!=WIN
 
 
 Pattern A1117
@@ -4296 +4296 @@
 X*b
 ?aY
 
-;!xplay_defend_both(*,a,b)
+;xplay_defend_both(*,a,b)!=WIN
 
 
 Pattern A1117a
@@ -4310 +4310 @@
 Y*b
 ?aX
 
-;!xplay_defend_both(*,a,b)
+;xplay_defend_both(*,a,b)!=WIN
 
 
 Pattern A1118
@@ -4454 +4454 @@
 
 ;(owl_escape_value(c) > 0
 ; || owl_escape_value(b) > 0)
-;&& oplay_defend_both(*,d,A,*)
+;&& oplay_defend_both(*,d,A,*)==WIN
 
 
 Pattern A1124a
@@ -4476 +4476 @@
 ;(owl_escape_value(d) > 0
 ; || owl_escape_value(b) > 0
 ; || owl_escape_value(c) > 0)
-;&& !oplay_defend_both(e,*,A,e)
+;&& oplay_defend_both(e,*,A,e)!=WIN
 
 
 Pattern A1124b
@@ -4987 +4987 @@
 ?a?
 B*C
 
-;attack(a) && !oplay_attack(*,a) && !oplay_defend_both(*,B,C)
+;attack(a) && !oplay_attack(*,a) && oplay_defend_both(*,B,C)!=WIN
 
 
 #########################################################

patterns/owl_defendpats.db

@@ -4252 +4252 @@
 A*
 OB
 
-;vital_chain(A) && vital_chain(B) && !ko(*) && !oplay_defend_both(*,A,B)
+;vital_chain(A) && vital_chain(B) && !ko(*) && oplay_defend_both(*,A,B)!=WIN
 
 
 Pattern D1100b
@@ -4266 +4266 @@
 A*
 OB
 
-;vital_chain(A)>1 && vital_chain(B)>1 && !oplay_defend_both(*,A,B)
+;vital_chain(A)>1 && vital_chain(B)>1 && oplay_defend_both(*,A,B)!=WIN
 
 
 Pattern D1101
@@ -4402 +4402 @@
 eOODf
 .....
 
-; !oplay_defend_both(*,f,a,B,C) && oplay_attack(*,D) && !safe_xmove(e)
+; oplay_defend_both(*,f,a,B,C)!=WIN && oplay_attack(*,D) && !safe_xmove(e)
 
 
 Pattern D1108b
@@ -4419 +4419 @@
 .aaXX
 .....
 
-;owl_goal_dragon(a) && !oplay_defend_both(*,B,C)
+;owl_goal_dragon(a) && oplay_defend_both(*,B,C)!=WIN
 
 
 Pattern D1109
@@ -4732 +4732 @@
 OAc
 B*?
 
-;lib(A)==2 && owl_escape_value(c)>0 && !oplay_defend_both(*,A,B)
+;lib(A)==2 && owl_escape_value(c)>0 && oplay_defend_both(*,A,B)!=WIN
 
 
 Pattern D1125
@@ -4957 +4957 @@
 aO
 Ob
 
-; (owl_escape_value(*) > 0) && !oplay_defend_both(*,a,b)
+; (owl_escape_value(*) > 0) && oplay_defend_both(*,a,b)!=WIN
 
 
 Pattern D1140
@@ -5121 +5121 @@
 *.O
 Boo
 
-; lib(A)==2 && !oplay_defend_both(*,A,B)
+; lib(A)==2 && oplay_defend_both(*,A,B)!=WIN
 
 
 Pattern D1202
@@ -5835 +5835 @@
 dab.
 ofoo
 
-;owl_escape_value(f)>0 && !oplay_defend_both(*,a,b,c,d,a,E)
+;owl_escape_value(f)>0 && oplay_defend_both(*,a,b,c,d,a,E)!=WIN
 
 
 Pattern D1331