Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnugo/gnugo/ChangeLog,v
retrieving revision 1.209
diff -u -r1.209 ChangeLog
--- ChangeLog	21 Feb 2002 16:52:42 -0000	1.209
+++ ChangeLog	21 Feb 2002 19:23:51 -0000
@@ -2,6 +2,7 @@
 -- ChangeLog
 -------------------------------------------------------------------------
 
+- pattern cleanup
 - spelling fixes
 - verbosity revisions with alternate connections in readconnect.c
 - bugfix in close_bubbles()
Index: patterns/barriers.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/barriers.db,v
retrieving revision 1.26
diff -u -r1.26 barriers.db
--- patterns/barriers.db	19 Feb 2002 18:04:23 -0000	1.26
+++ patterns/barriers.db	21 Feb 2002 19:23:52 -0000
@@ -834,6 +834,7 @@
 
 ;oplay_attack(a,b,b)
 
+
 Pattern Barrier60a
 
 .X.
@@ -902,6 +903,7 @@
 
 >return (lib(a)>2 || (lib(a) == 2 && connect_and_cut_helper(a,b,c)));
 
+
 Pattern Intrusion1c
 
 xxxx
@@ -919,6 +921,7 @@
 ;safe_omove(a)
 >return (lib(b)>2 || (lib(b) == 2 && connect_and_cut_helper(b,c,d)));
 
+
 Pattern Intrusion1d
 # ab New pattern (3.1.24).
 
@@ -1009,6 +1012,7 @@
 ;oplay_attack(a,b,C)
 >return (!xplay_attack(b,d));
 
+
 Pattern Intrusion5b
 
 .QX
@@ -1276,7 +1280,6 @@
 
 :8,B,value(30)
 
-
 X..
 ba.
 o..
@@ -1284,6 +1287,7 @@
 
 >return (!xplay_attack(a,b));
 
+
 Pattern Intrusion20
 
 oQ!
@@ -1310,7 +1314,7 @@
 a!.
 x..
 
->return(!xplay_attack(a,b));
+>return (!xplay_attack(a,b));
 
 
 Pattern Intrusion21b
@@ -1325,7 +1329,8 @@
 ba.
 x..
 
->return(!xplay_attack(a,b));
+>return (!xplay_attack(a,b));
+
 
 Pattern Intrusion22
 
@@ -1338,8 +1343,8 @@
 b.X
 a..
 .!.
-  
->return(!xplay_attack(a,b));
+
+>return (!xplay_attack(a,b));
 
 
 Pattern Intrusion23
@@ -1735,6 +1740,7 @@
 
 ;lib(a)>2
 
+
 Pattern Intrusion48
 # ab New pattern. (3.1.23)
 # FIXME: This would need a constraint. The one below did not work.
@@ -1753,6 +1759,7 @@
 # 
 # ;oplay_attack(a,b,c,d,e,f,f)
 
+
 Pattern Intrusion49
 # ab added (3.1.24)
 
@@ -1767,6 +1774,7 @@
 ;oplay_attack(a,b) && ! attack(b)
 >return (!xplay_attack(a,c));
 
+
 Pattern Intrusion50
 # ab added (3.1.25)
 
@@ -1776,7 +1784,7 @@
 ---
 
 :8,BO,value(30)
-  
+
 ?c.
 dXa
 .b.
@@ -2085,7 +2093,7 @@
 
 :8,t
 
-|ef
+|e?
 |cd
 |ab
 |OX
Index: patterns/conn.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/conn.db,v
retrieving revision 1.19
diff -u -r1.19 conn.db
--- patterns/conn.db	1 Feb 2002 20:29:45 -0000	1.19
+++ patterns/conn.db	21 Feb 2002 19:23:52 -0000
@@ -441,16 +441,15 @@
 
 :8,B
 
-Gb.
-caF
+ca.
+b*d
 .!.
 ---
 
-; xplay_attack_either(a,b,G,F) &&
-; xplay_attack_either(a,c,G,F)
+; xplay_attack_either(*,a,c,d)
+; && xplay_attack_either(*,b,c,d)
 
 
- 
 ##########################
 #
 # B patterns in the center
@@ -665,7 +664,7 @@
 
 :8,BX
 
-XA*O	double cut.
+XA*O
 ObOc
 
 ; xplay_attack(*,A) && !xplay_attack_either(*,b,c,c,*)
@@ -683,12 +682,12 @@
 
 :8,B
 
-?*?   save cutting stone.
+?*?
 OXO
 aOb
 
-; !xplay_attack_either(*,b,a,*,a) &&
-; !xplay_attack_either(*,a,b,*,b)
+; !xplay_attack_either(*,b,a,*,a)
+; && !xplay_attack_either(*,a,b,*,b)
 
 
 ########################
@@ -893,7 +892,7 @@
 OaO
 bcd
 efg
-hOi
+.O.
 
 ;omoyo(a) && oarea(c) && oarea(f)
 ;&& ((omoyo(b) + omoyo(c) + omoyo(d) + omoyo(e) + omoyo(f) +omoyo(g)) >= 3)
Index: patterns/endgame.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/endgame.db,v
retrieving revision 1.29
diff -u -r1.29 endgame.db
--- patterns/endgame.db	13 Feb 2002 05:40:10 -0000	1.29
+++ patterns/endgame.db	21 Feb 2002 19:23:52 -0000
@@ -130,12 +130,10 @@
 ba*x
 ----
 
-; marginal_eye(*) && proper_eye(a) && proper_eye(b) 
+; marginal_eye(*) && proper_eye(a) && proper_eye(b)
 ; && xplay_attack(*,a,c)
 
 
-
-
 Pattern EE2
 
 OXXx
@@ -491,6 +489,7 @@
 ;marginal_eye(*) && marginal_eye(a) && marginal_eye(c)
 ;&& (oplay_attack(*,a,b,a) || oplay_attack(*,a,b,D))
 
+
 Pattern EE203Y
 
 OXX.           1 point double sente
@@ -1322,6 +1321,7 @@
 
 ;marginal_eye(*) && proper_eye(a)
 
+
 Pattern CE15Y
 
 .X?       sente endgame move
@@ -1366,6 +1366,7 @@
 
 ;marginal_eye(*) && proper_eye(a) && olib(*)>2
 
+
 Pattern CE16Y
 
 .X?       sente endgame move
@@ -1410,6 +1411,7 @@
 
 ;marginal_eye(*) && proper_eye(a) && olib(*)>2
 
+
 Pattern CE17Y
 
 XO          endgame move
@@ -1611,7 +1613,6 @@
 ; && proper_eye(b) && oplay_attack(*,A)
 
 
-
 ######################################################################
 #
 # Center followup patterns
@@ -1659,6 +1660,8 @@
 Pattern CF3
 # tm New Pattern (3.1.23) (see arend:36)
 # FIXME: Perhaps better in patterns.db?
+# gf This pattern is redundant because the followup has already been
+#    found by find_worm_threats(). (This was broken in 3.1.23 and 3.1.24.)
 
 O*.O  threaten to save
 
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.52
diff -u -r1.52 owl_attackpats.db
--- patterns/owl_attackpats.db	1 Feb 2002 17:28:44 -0000	1.52
+++ patterns/owl_attackpats.db	21 Feb 2002 19:23:53 -0000
@@ -722,7 +722,7 @@
 
 :8,-,value(50)
 
-???a?             back off to prevent jump
+???a?
 ?xx.?
 xX.*?
 ....?
@@ -731,7 +731,6 @@
 ;owl_escape_value(a) < 1
 
 
-
 Pattern A222
 
 ?oOo??           clamp
@@ -1127,12 +1126,12 @@
 
 :8,-,value(70)
 
-b*.?
-Xa..
+a*.?
+X...
 ?..?
 ????
 
-;lib(b)<=2 || xlib(*)>2
+;lib(a)<=2 || xlib(*)>2
 
 
 Pattern A403
@@ -1232,6 +1231,7 @@
 ;owl_escape_value(a)>0
 ; && (xplay_attack(b,c,*,d,d) || !xplay_defend(*,b,d,e,e))
 
+
 Pattern A407
 
 O.X
@@ -2640,11 +2640,11 @@
 
 :8,s,value(25)
 
-AAbX
-A.*.
+XXaX
+X.*.
 ----
 
-;!safe_omove(b)
+;!safe_omove(a)
 
 
 Pattern A915
@@ -2859,7 +2859,7 @@
 a*b
 Oc?
 
-;(owl_escape_value(a)>0 || owl_escape_value(b)>0) 
+;(owl_escape_value(a)>0 || owl_escape_value(b)>0)
 ; && oplay_attack(*,c,c)
 
 
@@ -2967,10 +2967,10 @@
 
 :8,-,value(75)
 
-Ae*D
-BfgC
+Ae*B
+AfgB
 
-; (owl_escape_value(A) > 0 || owl_escape_value(C) > 0)
+; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
 ; && oplay_defend_both(*,g,f,e,f,*)
 
 
@@ -3352,8 +3352,8 @@
 
 :8,n,value(80)
 
-C*b
-?aD
+X*b
+?aX
 
 ;!xplay_defend_both(*,a,b)
 
@@ -3416,8 +3416,8 @@
 ; (owl_escape_value(a) > 0)
 ; + (owl_escape_value(b) > 0)
 ; + (owl_escape_value(c) > 0) > 1
-; || (!o_somewhere(g) && !o_somewhere(h) &&
-;     owl_escape_value(e) + owl_escape_value(f) > 0)
+; || (!o_somewhere(g) && !o_somewhere(h)
+;     && owl_escape_value(e) + owl_escape_value(f) > 0)
 
 
 Pattern A1121
@@ -3459,12 +3459,12 @@
 
 :8,-,value(75)
 
-bdF?
-ec*a
+bdE?
+oc*a
 ----
 
 ; (owl_escape_value(a) > 0 || owl_escape_value(b) > 0)
-; && xplay_attack_either(*,c,d,c,F)
+; && xplay_attack_either(*,c,d,c,E)
 
 
 Pattern A1124
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.55
diff -u -r1.55 owl_defendpats.db
--- patterns/owl_defendpats.db	1 Feb 2002 17:28:44 -0000	1.55
+++ patterns/owl_defendpats.db	21 Feb 2002 19:23:54 -0000
@@ -756,7 +756,7 @@
 
 o...
 O.*.
-AB..
+Ax..
 ----
 
 ; oplay_attack(*,A)
@@ -1582,9 +1582,9 @@
 |*aO
 |?Oc
 
-; oplay_attack(*,a,a) && 
-; !xplay_attack_either(a,a,c) &&
-; oplay_attack(*,b,a,b)
+; oplay_attack(*,a,a)
+; && !xplay_attack_either(a,a,c)
+; && oplay_attack(*,b,a,b)
 
 
 Pattern D504
@@ -2770,7 +2770,7 @@
 
 Pattern D720
 # tm New pattern (3.1.16)
-  
+
 ?O.o
 O.*o
 
@@ -3429,7 +3429,7 @@
 
 :8,-,value(80)
 
-C*O?     Extend side eye-space in sente
+C*O?
 ?bao
 ----
 
@@ -4400,10 +4400,10 @@
 :8,-,value(35)
 
 O*a
-cB?
+B.?
 
 ; owl_escape_value(a)>0
-; && oplay_attack(*,a,c)
+; && oplay_attack(*,a,B)
 
 
 Pattern D1136
@@ -4461,6 +4461,7 @@
 ; && olib(*) > 1
 ; && oplay_attack_either(*,d,B,A)
 
+
 Pattern D1139
 # tm New Pattern (3.1.20) (see nngs:110)
 
@@ -5262,8 +5263,8 @@
 :8,-,value(90)
 
 ?O?
-AdX
-*BO
+XdX
+*XO
 ?c?
 
 ;owl_escape_value(c)>0 && owl_goal_dragon(d)
@@ -5311,7 +5312,7 @@
 :8,-,value(95)
 
 XOo
-*Xb
+*XO
 aOX
 
 ; owl_escape_value(a)>0
@@ -6111,6 +6112,7 @@
 ; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
 ; && (!x_somewhere(c) || oplay_attack_either(*,d,c,d))
 
+
 Pattern D1385
 # tm New Pattern (3.1.23)
 
@@ -6121,7 +6123,7 @@
 
 :8,-,value(75)
 
-fB    escape or capture
+fB
 dc
 e*
 ?A
@@ -6165,8 +6167,8 @@
 
 ----
 .*A?
-O.Oa
-?Ob?
+O.OX
+?OX?
 
 ;lib(A)==1
 
Index: patterns/owl_vital_apats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_vital_apats.db,v
retrieving revision 1.25
diff -u -r1.25 owl_vital_apats.db
--- patterns/owl_vital_apats.db	10 Jan 2002 20:36:58 -0000	1.25
+++ patterns/owl_vital_apats.db	21 Feb 2002 19:23:54 -0000
@@ -597,7 +597,7 @@
 :8,s,value(45)
 
 ?XX|
-XAB|
+XA.|
 X*X|
 XO.|
 ---+
@@ -717,7 +717,7 @@
 
 b*c
 .X.
-XAX
+X.X
 DXX
 
 ;!attack(D) && oplay_attack(*,b) && oplay_attack(*,c)
@@ -732,12 +732,12 @@
 
 :8,s,value(50)
 
-bXXd
-aO*c
+XXXb
+.O*a
 ----
 
-; !oplay_attack(*,c,d,d)
-; && !oplay_attack(*,d,c,c)
+; !oplay_attack(*,a,b,b)
+; && !oplay_attack(*,b,a,a)
 
 
 Pattern VA44
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.54
diff -u -r1.54 patterns.db
--- patterns/patterns.db	14 Feb 2002 15:26:39 -0000	1.54
+++ patterns/patterns.db	21 Feb 2002 19:23:55 -0000
@@ -3727,12 +3727,12 @@
 :8,OXe
 
 ??.?
-B*.a
+A*.O
 ....
 ....
 ----
 
-;!weak(B)
+;!weak(A)
 
 
 Pattern EB307
@@ -3919,13 +3919,13 @@
 
 :8,Oe,jump_out_far_helper
 
-?..ex
-da..g
+?..dx
+Oa..e
 cb.*.
 .....
 -----
 
-;oplay_attack(*,a,b,c,c) && x_somewhere(e,g)
+;oplay_attack(*,a,b,c,c) && x_somewhere(d,e)
 
 
 Pattern EB404
@@ -5009,6 +5009,7 @@
 
 :8,OXbFY,followup(1),reverse_followup(3)
 
+
 Pattern EB709Y
 
 |.XO    extending in the corner is huge: double sente
@@ -5068,7 +5069,7 @@
 
 ?O..
 XOb.
-C*a.
+X*a.
 ----
 
 ; !xplay_attack_either(*,a,b,*,b)
@@ -5085,7 +5086,7 @@
 :8,OXb,reverse_followup(3)
 
 ?Ob.
-C*a.
+X*a.
 ----
 
 ;!xplay_attack_either(*,a,b,*,b)
@@ -5833,6 +5834,7 @@
 
 ;xmoyo(c) && oplay_attack(*,a,a) && !oplay_attack(*,a,b,*)
 
+
 Pattern EB1101Y
 
 ?x??       big push in sente
@@ -5843,11 +5845,11 @@
 :8,OXeY
 
 ?x??
-?Xbc
-O*a.
+?X.a
+O*..
 ----
 
-;xmoyo(c) 
+;xmoyo(a)
 
 
 Pattern EB1102
@@ -7288,7 +7290,7 @@
 e....
 .....
 cb*..
-da...
+Oa...
 ?X...
 
 ;!xmoyo(e) && oplay_attack(*,a,b,c,c)
@@ -7469,7 +7471,7 @@
 
 :8,a
 
-?.a
+?.O
 .*A
 ?OA
 
@@ -7735,7 +7737,6 @@
 ; oplay_connect(*,A,*)
 
 
-
 Pattern CB238
 
 ..?            block off area
@@ -8177,16 +8178,17 @@
 
 :8,OXe
 
-??O?        jump out
+??O?
 ?XOa
 Xecd
 ..*b
 ????
 
-; o_somewhere(a,b) 
+; o_somewhere(a,b)
 ; || oplay_attack(*,c,d,e,b,a)
 ; || oplay_attack(*,c,d,e,a,b)
 
+
 Pattern CB274
 
 ??????          extend (urgent)
@@ -8659,7 +8661,7 @@
 
 :8,OXe
 
-xX..          jump!
+xX..
 ?...
 A.*.
 ?o??
@@ -10725,7 +10727,7 @@
 :8,OXdac
 
 a*..
-Ob.O
+O..O
 
 ; does_attack(*,a)
 
@@ -10771,10 +10773,10 @@
 :8,XEd,shape(10)
 
 ?Xa.
-BBX.
+OOX.
 ..*.
 
-; attack(a)&&!defend(a)
+; attack(a) && !defend(a)
 
 
 Pattern CD92
@@ -11734,8 +11736,8 @@
 
 ....
 .*..
-bXOO
-.aCC
+.XOO
+.aXX
 ....
 ....
 ----
@@ -13052,6 +13054,7 @@
 
 ;xmoyo(a)
 
+
 Pattern LE1Y
 
 O.Xx      fourth line sente kosumi
@@ -13100,6 +13103,7 @@
 
 ;xmoyo(a) && (!o_somewhere(c)||o_somewhere(b))
 
+
 Pattern LE2Y
 
 ?????     third line sente kosumi
@@ -13129,6 +13133,7 @@
 
 ;omoyo(a)
 
+
 Pattern LE3Y
 
 xXx       expand territory
@@ -13174,6 +13179,7 @@
 
 ; xmoyo(*) && lib(A) > 2
 
+
 Pattern LE5Y
 
 ?Xxx
@@ -13252,6 +13258,7 @@
 
 :8,OXFY,value(10)
 
+
 Pattern LE9Y
 
 oo..?       good local sente
@@ -13295,6 +13302,7 @@
 
 ; xmoyo(a)
 
+
 Pattern LE11Y
 
 ...       jump towards the opponent's territory
@@ -13389,6 +13397,7 @@
 ?o?
 
 ; xmoyo(a)||xmoyo(b)||xmoyo(c)||xmoyo(d)||xmoyo(e)||xmoyo(f)
+
 
 Pattern LE15Y
 # tm decreased value (3.1.20) (see nngs:1150 move G4)
Index: patterns/patterns2.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns2.db,v
retrieving revision 1.31
diff -u -r1.31 patterns2.db
--- patterns/patterns2.db	1 Feb 2002 17:28:44 -0000	1.31
+++ patterns/patterns2.db	21 Feb 2002 19:23:55 -0000
@@ -554,7 +554,7 @@
 
 :8,C
 
-eDbf
+ODbO
 *Oac
 
 ;!oplay_defend_both(*,a,b,a,D) && !oplay_defend_both(*,b,a,c,b,c)
@@ -1276,7 +1276,7 @@
 O*
 aO
 
-;!eye(a) 
+;!eye(a)
 
 
 Pattern Shape3
@@ -2089,7 +2089,7 @@
 
 ?.?
 *.a
-bDa
+bXa
 ?c?
 
 ;lib(a)>1 && lib(b)>1 && lib(c)>1
@@ -2516,7 +2516,6 @@
 XOO
 
 :8,X,shape(1)
-
 
 
 ###########################
Index: patterns/read_attack.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/read_attack.db,v
retrieving revision 1.3
diff -u -r1.3 read_attack.db
--- patterns/read_attack.db	9 Feb 2002 16:11:29 -0000	1.3
+++ patterns/read_attack.db	21 Feb 2002 19:23:55 -0000
@@ -113,8 +113,6 @@
 ; rgoal[a] == 1 && olib(*) == 1
 
 
-
-
 Pattern RA007
 
 Y*   snapback or better
@@ -122,7 +120,7 @@
 
 :8,A,minvalue(55),maxvalue(71)
 
-aA
+a*
 Xb
 
 ; rgoal[a] == 1 && xlib(b)==1
@@ -133,7 +131,6 @@
 >   set_value(55);
 
 
-
 Pattern RA008
 # this pattern doesn't really make sense.
 # maybe it can be repaired.
@@ -146,7 +143,8 @@
 a*
 ab
 
-; 0 && rgoal[a] == 1 && xlib(b) <= 2 && olib(*) > 1 
+; 0 && rgoal[a] == 1 && xlib(b) <= 2 && olib(*) > 1
+
 
 ###################
 #Protect boundary:#
@@ -161,11 +159,11 @@
 :8,A,minvalue(10), maxvalue(73)
 
 ab
-C.
+*?
 
 ; lib(a) == 1  && lib(b) <=2
 
-> if (!ko(C))
+> if (!ko(*))
 >   set_value(73);
 > else
 >   set_value(10);
@@ -189,7 +187,6 @@
 >   set_value(72);
 
 
-
 Pattern RA102
 
 Q*	extend or connect for liberties
@@ -204,15 +201,13 @@
 >   set_value(77);
 > else if (lib(A) == 1)
 >   set_value(71);
-> else if (lib(A) == 2 && olib(*) > 2)  
+> else if (lib(A) == 2 && olib(*) > 2)
 >   /* FIXME: i.e. backfill hack; causes explosion; see reading:35*/
 >   set_value(10);
 > else
 >   set_value(0);
 
 
-
-
 ###########
 #backfill #
 ###########
@@ -243,6 +238,7 @@
 ;&& ((goallib() == 3 && stackp <= backfill2_depth)
 ;    || (goallib() == 2 && stackp <= backfill_depth))
 
+
 Pattern RA202
 # FIXME: Need a better way to protect border.
 
@@ -252,11 +248,11 @@
 
 Ba*
 
-# FIMXE: Taking out to reduce variations
-; 0 && 
-; rgoal[B] == 2 
-; && lib(a) <= 2 
-; && lib(B) <= goallib() 
+# FIXME: Taking out to reduce variations
+; 0 &&
+; rgoal[B] == 2
+; && lib(a) <= 2
+; && lib(B) <= goallib()
 ; && (ko(*) || olib(*) > 1)
 
 
@@ -275,6 +271,7 @@
 #   reading:26
 ; 0 && rgoal[B] == 2 && lib(a) <= 2 && lib(B) <= goallib() && (ko(*) || olib(*) > 1)
 
+
 Pattern RA203
 # FIXME: Need a better way to double back
 
@@ -310,7 +307,7 @@
 
 :8,A,value(35)
 
-ab    back-atari
+ab
 *.
 
 ; lib(b) < goallib()
@@ -324,7 +321,7 @@
 
 :8,A,value(36)
 
-*ab    back-atari
+*ab
 
 ; lib(b) < goallib()
 ; && lib(a) == lib(b)
@@ -338,14 +335,13 @@
 
 :8,A,value(30)
 
-Oab    back-atari
+Oab
 *X.
 
 ; lib(b) < goallib()
 ; && lib(a) == lib(b)
 ; && olib(*) >= lib(b)
 
-
 ###############################
 #superstring attacks (need to add entire superstring to rgoal?)
 ################################
@@ -395,10 +391,6 @@
 >   set_value(0)
 
 
-
-
-
-
 Pattern RA303
 
 X*
@@ -411,10 +403,11 @@
 
 ; goallib() < lib(a) && lib(a) <=3 && olib(*) >= 2 && xlib(b) <= 4
 
+
 ###########
 #draw back#
 ###########
-Pattern RA301
+Pattern RA401
 
 *O
 .Y
@@ -450,12 +443,11 @@
 
 :8,A,value(9)
 
-a.    diagonal liberty
+a.
 ?*
 
 # Too many variations.
 ; 0 && rgoal[a] == 1
-
 
 
 Pattern RA999